优化按日期导出入库出库明细8.28

warewms-ams/src/main/java/com/ruoyi/ams/asn/service/impl/WmsDocAsnHeaderServiceImpl.java

@@ -138,11 +138,11 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
         List<WmsDocAsnExportTime> result = wmsDocAsnHeaders.stream()
                 .flatMap(map1 -> wmsDocAsnDetails.stream()
                         .filter(map2 -> map2.getAsnNo().equals(map1.getAsnNo()))
-                        .filter(map2 -> "DZ".equals(map1.getAsnType()) || "YK".equals(map1.getAsnType()))
+                        .filter(map2 -> Constant.ASN_TYP.DZ.getValue().equals(map1.getAsnType()) || Constant.ASN_TYP.YK.getValue().equals(map1.getAsnType()))
                         .map(map2 -> {
                             String formattedDate = sdf.format(map2.getCreateTime());
                             BigDecimal receivedQty = map2.getReceivedQty() != null && !"0E-8".equals(map2.getReceivedQty().toString()) ? map2.getReceivedQty() : new BigDecimal("0");
-                            if ("DZ".equals(map1.getAsnType())) {
+                            if (Constant.ASN_TYP.DZ.getValue().equals(map1.getAsnType())) {
                                 return new WmsDocAsnExportTime(
                                         formattedDate,
                                         map2.getSku(),

warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/WmsDocOrderHeaderServiceImpl.java

@@ -134,11 +134,11 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         List<WmsDocOrderExportTime> result = wmsDocOrderHeaders.stream()
                 .flatMap(map1 -> wmsDocOrderDetails.stream()
                         .filter(map2 -> map2.getOrderNo().equals(map1.getOrderNo()))
-                        .filter(map2 -> "DZ".equals(map1.getOrderType()) || "YK".equals(map1.getOrderType()))
+                        .filter(map2 -> Constant.ASN_TYP.DZ.getValue().equals(map1.getOrderType()) || Constant.ASN_TYP.YK.getValue().equals(map1.getOrderType()))
                         .map(map2 -> {
                             String formattedDate = sdf.format(map2.getCreateTime());
                             BigDecimal qtyAllocated = map2.getQtyAllocated() != null && !"0E-8".equals(map2.getQtyAllocated().toString()) ? map2.getQtyAllocated() : new BigDecimal("0");
-                            if ("DZ".equals(map1.getOrderType())) {
+                            if (Constant.ASN_TYP.DZ.getValue().equals(map1.getOrderType())) {
                                 return new WmsDocOrderExportTime(
                                         formattedDate,
                                         map2.getSku(),