'修改销售bug'

src/main/java/com/steerinfo/dil/service/impl/AmsDispatchSaleOrderServiceImpl.java

@@ -106,25 +106,25 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
             String subMaterialTheoreticalWeight = null;
             String subMaterialSpecificationModel = null;
             if (allMaterialName.length() >= 2) {
-                subMaterialName = allMaterialName.substring(0, allMaterialName.length() - 2);
+                subMaterialName = allMaterialName.substring(0, allMaterialName.length() - 1);
             }
             if (allMaterialName.length() < 2) {
                 subMaterialName = allMaterialName;
             }
             if (allMaterialNumber.length() >= 2) {
-                subMaterialNumber = allMaterialNumber.substring(0, allMaterialNumber.length() - 2);
+                subMaterialNumber = allMaterialNumber.substring(0, allMaterialNumber.length() - 1);
             }
             if (allMaterialNumber.length() < 2) {
                 subMaterialNumber = allMaterialNumber;
             }
             if (allMaterialTheoreticalWeight.length() >= 2) {
-                subMaterialTheoreticalWeight = allMaterialTheoreticalWeight.substring(0, allMaterialTheoreticalWeight.length() - 2);
+                subMaterialTheoreticalWeight = allMaterialTheoreticalWeight.substring(0, allMaterialTheoreticalWeight.length() - 1);
             }
             if (allMaterialTheoreticalWeight.length() < 2) {
                 subMaterialTheoreticalWeight = allMaterialTheoreticalWeight;
             }
             if (allMaterialSpecificationModel.length() >= 2) {
-                subMaterialSpecificationModel = allMaterialSpecificationModel.substring(0, allMaterialSpecificationModel.length() - 2);
+                subMaterialSpecificationModel = allMaterialSpecificationModel.substring(0, allMaterialSpecificationModel.length() - 1);
             }
             if (allMaterialSpecificationModel.length() < 2) {
                 subMaterialSpecificationModel = allMaterialSpecificationModel;
@@ -198,25 +198,25 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
                 String subMaterialTheoreticalWeight = null;
                 String subMaterialSpecificationModel = null;
                 if (allMaterialName.length() >= 2) {
-                    subMaterialName = allMaterialName.substring(0, allMaterialName.length() - 2);
+                    subMaterialName = allMaterialName.substring(0, allMaterialName.length() - 1);
                 }
                 if (allMaterialName.length() < 2) {
                     subMaterialName = allMaterialName;
                 }
                 if (allMaterialNumber.length() >= 2) {
-                    subMaterialNumber = allMaterialNumber.substring(0, allMaterialNumber.length() - 2);
+                    subMaterialNumber = allMaterialNumber.substring(0, allMaterialNumber.length() - 1);
                 }
                 if (allMaterialNumber.length() < 2) {
                     subMaterialNumber = allMaterialNumber;
                 }
                 if (allMaterialTheoreticalWeight.length() >= 2) {
-                    subMaterialTheoreticalWeight = allMaterialTheoreticalWeight.substring(0, allMaterialTheoreticalWeight.length() - 2);
+                    subMaterialTheoreticalWeight = allMaterialTheoreticalWeight.substring(0, allMaterialTheoreticalWeight.length() - 1);
                 }
                 if (allMaterialTheoreticalWeight.length() < 2) {
                     subMaterialTheoreticalWeight = allMaterialTheoreticalWeight;
                 }
                 if (allMaterialSpecificationModel.length() >= 2) {
-                    subMaterialSpecificationModel = allMaterialSpecificationModel.substring(0, allMaterialSpecificationModel.length() - 2);
+                    subMaterialSpecificationModel = allMaterialSpecificationModel.substring(0, allMaterialSpecificationModel.length() - 1);
                 }
                 if (allMaterialSpecificationModel.length() < 2) {
                     subMaterialSpecificationModel = allMaterialSpecificationModel;
@@ -252,10 +252,10 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
         }
         for (Map<String, Object> map : mapList) {
             BigDecimal dispatchId = (BigDecimal) map.get("dispatchId");
-            List<Map<String,Object>> orderIdList = amsDispatchSaleOrderMapper.getNullOrNotNull(dispatchId);
-            if (orderIdList != null || orderIdList.size() != 0) {
-                mapList.remove(map);
-            }
+//            List<Map<String,Object>> orderIdList = amsDispatchSaleOrderMapper.getNullOrNotNull(dispatchId);
+//            if (orderIdList != null || orderIdList.size() != 0) {
+//                mapList.remove(map);
+//            }
             List<Map<String, Object>> materialMessages = amsDispatchSaleOrderMapper.getMaterialMessages(dispatchId);
             String allMaterialName = "";
             String allMaterialNumber = "";
@@ -283,25 +283,25 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
                 String subMaterialTheoreticalWeight = null;
                 String subMaterialSpecificationModel = null;
                 if (allMaterialName.length() >= 2) {
-                    subMaterialName = allMaterialName.substring(0, allMaterialName.length() - 2);
+                    subMaterialName = allMaterialName.substring(0, allMaterialName.length() - 1);
                 }
                 if (allMaterialName.length() < 2) {
                     subMaterialName = allMaterialName;
                 }
                 if (allMaterialNumber.length() >= 2) {
-                    subMaterialNumber = allMaterialNumber.substring(0, allMaterialNumber.length() - 2);
+                    subMaterialNumber = allMaterialNumber.substring(0, allMaterialNumber.length() - 1);
                 }
                 if (allMaterialNumber.length() < 2) {
                     subMaterialNumber = allMaterialNumber;
                 }
                 if (allMaterialTheoreticalWeight.length() >= 2) {
-                    subMaterialTheoreticalWeight = allMaterialTheoreticalWeight.substring(0, allMaterialTheoreticalWeight.length() - 2);
+                    subMaterialTheoreticalWeight = allMaterialTheoreticalWeight.substring(0, allMaterialTheoreticalWeight.length() - 1);
                 }
                 if (allMaterialTheoreticalWeight.length() < 2) {
                     subMaterialTheoreticalWeight = allMaterialTheoreticalWeight;
                 }
                 if (allMaterialSpecificationModel.length() >= 2) {
-                    subMaterialSpecificationModel = allMaterialSpecificationModel.substring(0, allMaterialSpecificationModel.length() - 2);
+                    subMaterialSpecificationModel = allMaterialSpecificationModel.substring(0, allMaterialSpecificationModel.length() - 1);
                 }
                 if (allMaterialSpecificationModel.length() < 2) {
                     subMaterialSpecificationModel = allMaterialSpecificationModel;
@@ -374,25 +374,25 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
             String subMaterialTheoreticalWeight = null;
             String subMaterialSpecificationModel = null;
             if (allMaterialName.length() >= 2) {
-                subMaterialName = allMaterialName.substring(0, allMaterialName.length() - 2);
+                subMaterialName = allMaterialName.substring(0, allMaterialName.length() - 1);
             }
             if (allMaterialName.length() < 2) {
                 subMaterialName = allMaterialName;
             }
             if (allMaterialNumber.length() >= 2) {
-                subMaterialNumber = allMaterialNumber.substring(0, allMaterialNumber.length() - 2);
+                subMaterialNumber = allMaterialNumber.substring(0, allMaterialNumber.length() - 1);
             }
             if (allMaterialNumber.length() < 2) {
                 subMaterialNumber = allMaterialNumber;
             }
             if (allMaterialTheoreticalWeight.length() >= 2) {
-                subMaterialTheoreticalWeight = allMaterialTheoreticalWeight.substring(0, allMaterialTheoreticalWeight.length() - 2);
+                subMaterialTheoreticalWeight = allMaterialTheoreticalWeight.substring(0, allMaterialTheoreticalWeight.length() - 1);
             }
             if (allMaterialTheoreticalWeight.length() < 2) {
                 subMaterialTheoreticalWeight = allMaterialTheoreticalWeight;
             }
             if (allMaterialSpecificationModel.length() >= 2) {
-                subMaterialSpecificationModel = allMaterialSpecificationModel.substring(0, allMaterialSpecificationModel.length() - 2);
+                subMaterialSpecificationModel = allMaterialSpecificationModel.substring(0, allMaterialSpecificationModel.length() - 1);
             }
             if (allMaterialSpecificationModel.length() < 2) {
                 subMaterialSpecificationModel = allMaterialSpecificationModel;

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -141,7 +141,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             //设置成交类型
             amsDispatchSaleOrder.setDispatchType(new BigDecimal(0));
             //设置下发状态为未下发
-            amsDispatchSaleOrder.setDispatchStatus(new BigDecimal(0));
+            amsDispatchSaleOrder.setDispatchStatus(new BigDecimal(1));
             amsDispatchSaleOrder.setInsertTime(new Date());
             amsDispatchSaleOrder.setInsertUsername("admin");
             amsDispatchSaleOrderMapper.insertSelective(amsDispatchSaleOrder);
@@ -390,7 +390,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         for (Map<String,Object> map : mapValue) {
             Integer dispatchId = (Integer)map.get("dispatchId");
             AmsDispatchSaleOrder amsDispatchSaleOrder = amsDispatchSaleOrderMapper.selectByPrimaryKey(new BigDecimal(dispatchId));
-            amsDispatchSaleOrder.setDispatchStatus(new BigDecimal(1));
+            amsDispatchSaleOrder.setDispatchStatus(new BigDecimal(0));
             result = amsDispatchSaleOrderMapper.updateByPrimaryKeySelective(amsDispatchSaleOrder);
         }
         return result;

src/main/resources/com/steerinfo/dil/mapper/AmsDispatchSaleOrderMapper.xml

@@ -555,7 +555,8 @@
         LEFT JOIN RMS_RECEIVE_ADDRESS RRA
         ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRA.ADDRESS_ID
         WHERE ADSO.DISPATCH_TYPE = #{dispatchType}
-        AND ADSO.DISPATCH_STATUS = 1
+        AND ADSO.DISPATCH_STATUS = 0
+        AND ADSO.DISPATCH_DEAL_TIME IS NULL
         )
         <where>
             <if test="saleOrderMaterialTruckNo != null">