1111

src/main/java/com/th/demo/mapping/ware/DistributionDetailMapper.java

@@ -23,4 +23,7 @@ public interface DistributionDetailMapper {
     int updateCancelFlagById(Map<String,Object> map);
 
     List<DistributionDetail> selectByStoreId(String storeId);
+
+    int updateByStoreAndDis(String distributionId,String storeId);
+
 }

src/main/java/com/th/demo/service/impl/ware/OutServiceImpl.java

@@ -45,6 +45,8 @@ public class OutServiceImpl implements OutService {
     @Autowired
     public DistributionMapper distributionMapper;
     @Autowired
+    public DistributionDetailMapper distributionDetailMapper;
+    @Autowired
     public AccountDetailMapper accountDetailMapper;
     @Autowired
     public ChangeRecordMapper changeRecordMapper;
@@ -117,8 +119,11 @@ public class OutServiceImpl implements OutService {
             store.setLayer(currentLayer + 1);
             //store.setStack(stack);
             OutRecord outRecord = getOutRecord(store, "", "0", userId);
+            //取消出库之后配车明细中进行删除
+            num += distributionDetailMapper.updateByStoreAndDis(listOutRecord.get(i).getDistributionId(),store.getId());
             num += outRecordMapper.insert(outRecord);
             num += storeMapper.insert(store);
+
             Distribution distribution = distributionMapper.selectByPrimaryKey(listOutRecord.get(i).getDistributionId());
             distribution.setSumWeight(distribution.getSumWeight()- store.getWeight());
             distribution.setSumCount(distribution.getSumCount()- store.getCount());
@@ -135,6 +140,8 @@ public class OutServiceImpl implements OutService {
     public String outByDistribution(String json, String userId, String belongId) throws Exception {
         Distribution distribution1 = JSON.parseObject(json, new TypeReference<Distribution>() {
         });
+        String pay_for = "";
+        double pay_money = 0;
         Distribution distribution = distributionMapper.selectByPrimaryKey(distribution1.getId());
         if (distribution.getOutFlag().equals("1")){
             return JSONTools.toString(1,"该车已出库，请勿重复操作");
@@ -164,6 +171,10 @@ public class OutServiceImpl implements OutService {
                     for (int i = 0; i < listStore.size(); i++) {
                         Store store = storeMapper.selectByPrimaryKey(listStore.get(i).getId());
                         OutRecord outRecord = getOutRecord(store, distribution.getId(), "1", userId);
+                        if (outRecord.getPayWay().equals("现金")){
+                            pay_for="现金";
+                            pay_money = pay_money+outRecord.getInvoicePrice();
+                        }
                         num += outRecordMapper.insert(outRecord);
                         AccountDetail accountDetail = getAccountDetail(listStore.get(i), distribution.getSumWeight(), distribution.getSuttle(), userId, belongId);
                         num += accountDetailMapper.insert(accountDetail);
@@ -180,6 +191,10 @@ public class OutServiceImpl implements OutService {
                     for (int i = 0; i < listStore.size(); i++) {
                         Store store = storeMapper.selectByPrimaryKey(listStore.get(i).getId());
                         OutRecord outRecord = getOutRecord(store, distribution.getId(), "1", userId);
+                        if (outRecord.getPayWay().equals("现金")){
+                            pay_for="现金";
+                            pay_money = pay_money+outRecord.getInvoicePrice();
+                        }
                         num += outRecordMapper.insert(outRecord);
 
                         AccountDetail accountDetail = getAccountDetail(listStore.get(i), distribution.getSumWeight(), distribution.getSuttle(), userId, belongId);
@@ -193,6 +208,11 @@ public class OutServiceImpl implements OutService {
                     result = Tools.moreThanZeroResultJSON(num);
                 }
             }
+
+        }
+        if (pay_for.equals("现金")){
+            result = result.substring(0, result.length() - 1) + ",\"payWay\":\"" + pay_for + "\",\"InvoicePrice\":" + pay_money + "}";
+
         }
 
         return result;

src/main/resource/localhost/db.properties

@@ -3,12 +3,12 @@
 #jdbc.user=root
 #jdbc.password=root
 
-jdbc.driverClass=com.mysql.jdbc.Driver
-jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_zg?characterEncoding=utf8
-jdbc.user=root
-jdbc.password=root
-
 #jdbc.driverClass=com.mysql.jdbc.Driver
-#jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/ware_zg?useUnicode=true&characterEncoding=utf8
+#jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_zg?characterEncoding=utf8
 #jdbc.user=root
-#jdbc.password=122403
+#jdbc.password=root
+
+jdbc.driverClass=com.mysql.jdbc.Driver
+jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/ware_zg?useUnicode=true&characterEncoding=utf8
+jdbc.user=root
+jdbc.password=122403

src/main/resource/mapper/ware/DistributionDetailMapper.xml

@@ -122,4 +122,11 @@
     and ifnull(cancel_flag,'0') = '0'
   </select>
 
+  <update id="updateByStoreAndDis" >
+    update t_ware_distribution_detail
+    set cancel_flag = '9'
+    where distribution_id = #{param1,jdbcType=VARCHAR}
+      and store_id = #{param2,jdbcType=VARCHAR}
+  </update>
+
 </mapper>