xwh完成收货明细导出、修改出库单列表显示规则

wms-core-service/src/main/java/com/lote/wms/instock/order/entity/resultvo/InOrderResultVo.java

@@ -27,6 +27,90 @@ public class InOrderResultVo extends InOrder {
 
 	private String barcode;
 
+	private String productName;
+
+
+	private String qualityName;
+
+
+	private String quantity;
+
+
+	private String productionDate;
+
+	private String shelfLifeDays;
+
+	private String expiryDate;
+
+	private String batchRuleName;
+
+	private String batchNo;
+
+
+	public String getProductionDate() {
+		return productionDate;
+	}
+
+	public void setProductionDate(String productionDate) {
+		this.productionDate = productionDate;
+	}
+
+	public String getShelfLifeDays() {
+		return shelfLifeDays;
+	}
+
+	public void setShelfLifeDays(String shelfLifeDays) {
+		this.shelfLifeDays = shelfLifeDays;
+	}
+
+	public String getExpiryDate() {
+		return expiryDate;
+	}
+
+	public void setExpiryDate(String expiryDate) {
+		this.expiryDate = expiryDate;
+	}
+
+	public String getBatchRuleName() {
+		return batchRuleName;
+	}
+
+	public void setBatchRuleName(String batchRuleName) {
+		this.batchRuleName = batchRuleName;
+	}
+
+	public String getBatchNo() {
+		return batchNo;
+	}
+
+	public void setBatchNo(String batchNo) {
+		this.batchNo = batchNo;
+	}
+
+	public String getQuantity() {
+		return quantity;
+	}
+
+	public void setQuantity(String quantity) {
+		this.quantity = quantity;
+	}
+
+	public String getQualityName() {
+		return qualityName;
+	}
+
+	public void setQualityName(String qualityName) {
+		this.qualityName = qualityName;
+	}
+
+	public String getProductName() {
+		return productName;
+	}
+
+	public void setProductName(String productName) {
+		this.productName = productName;
+	}
+
 	public String getBarcode() {
 		return barcode;
 	}

wms-core-service/src/main/java/com/lote/wms/instock/order/service/InOrderExportService.java

@@ -7,5 +7,6 @@ public interface InOrderExportService {
 
 	Message export(InOrderQueryVo vo);
 
-    Message exportReceiptDetail(InOrderQueryVo inOrderQueryVo);
+    Message exportReceiptDetail(
+            InOrderQueryVo inOrderQueryVo);
 }

wms-core-service/src/main/java/com/lote/wms/instock/order/service/impl/InOrderExportServiceImpl.java

@@ -12,6 +12,7 @@ import com.lote.wms.instock.order.entity.queryvo.InOrderQueryVo;
 import com.lote.wms.instock.order.entity.resultvo.InOrderResultVo;
 import com.lote.wms.instock.order.service.InOrderExportService;
 import com.lote.wms.instock.order.service.InOrderService;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.springframework.stereotype.Service;
 
@@ -156,12 +157,17 @@ public class InOrderExportServiceImpl implements InOrderExportService {
 			row[6] = inOrderResultVo.getTrackingNo1();
 			row[7] = inOrderResultVo.getSku();
 			row[8] = inOrderResultVo.getBarcode();
-			row[9] = inOrderResultVo.getCustomerCode();
-			row[10] = inOrderResultVo.getTypeName();
-			row[11] = inOrderResultVo.getRemark();
-			row[12] = inOrderResultVo.getShipwayCode();
-			row[13] = inOrderResultVo.getTrackingNo1();
-
+			row[9] = inOrderResultVo.getProductName();
+			row[10] = inOrderResultVo.getQualityName();
+			row[11] = inOrderResultVo.getQuantity();
+			row[12] = inOrderResultVo.getProductionDate();
+			row[13] = inOrderResultVo.getShelfLifeDays();
+			row[14] = inOrderResultVo.getExpiryDate();
+			row[15] = inOrderResultVo.getBatchNo();
+			row[16] = inOrderResultVo.getBatchRuleName();
+			row[17] = inOrderResultVo.getCreatedByUserCode();
+			row[18] = DateFormatUtils.format(inOrderResultVo.getCreatedTime(),"yyyy-mm-dd HH:mm:ss");
+			rows.add(row);
 		}
 		return rows;
 	}

wms-core-service/src/main/resources/mybatis/mapper/instock/order/InOrderMapper.xml

@@ -852,6 +852,21 @@
     o.api_type_code as apiTypeCode,
     o.status_code as statusCode,
     o.status_name as statusName,
+    o.order_no1 as orderNo1,
+    o.supplier_code as supplierCode,
+    o.tracking_no1 as trackingNo1,
+    r.sku as sku,
+    r.barcode as barcode,
+    r.product_name as productName,
+    r.quality_name as qualityName,
+    r.quantity as quantity,
+    r.production_date as productionDate,
+    r.shelf_life_days as shelfLifeDays,
+    r.expiry_date as expiryDate,
+    r.batch_no as batchNo,
+    r.batch_rule_name as batchRuleName,
+    r.created_by_user_code as createdByUserCode,
+    r.created_time as createdTime
     from in_order o
     LEFT JOIN in_receipt r on o.order_no1 = r.order_no1
     where 1=1

wms-operate/src/main/java/com/lote/wms/controller/operate/outstock/order/OutOrderController.java

@@ -448,7 +448,8 @@ public class OutOrderController extends AbstractController {
 			}
 			vo.setOrderByClause(vo.getSort_() + " " + order_);
 		} else {
-			vo.setOrderByClause("CONVERT(o.status_code,SIGNED) asc,o.created_time desc");
+//			vo.setOrderByClause("CONVERT(o.status_code,SIGNED) asc,o.created_time desc");
+			vo.setOrderByClause("o.created_time desc");
 		}
 	}