1111

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

@@ -73,10 +73,8 @@ public class OutRecordServiceImpl implements OutRecordService {
                     plateNo, fromDate,  toDate,   userId, belongId,carNo,tallyPeople,ordNo,fkComponyName,
                     contractNo,packNo,pltNos,ordNos,contractNos,packNos);
             PageInfo<OutRecord> pageInfo = new PageInfo<>(list);
-//        result = JSONTools.toString(pageInfo);
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
         }
-
         return result;
     }
     public String queryTotal(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,

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

@@ -128,71 +128,68 @@ public class OutServiceImpl implements OutService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public String outByDistribution(String json, String userId, String belongId) throws Exception {
-        Distribution distribution = JSON.parseObject(json, new TypeReference<Distribution>() {
+        Distribution distribution1 = JSON.parseObject(json, new TypeReference<Distribution>() {
         });
-        distribution.setOutFlag("1");
-        num += distributionMapper.updateByPrimaryKey(distribution);
-        List<String> listStoreId = new ArrayList<String>();
-        for (int i = 0; i < distribution.getListDetail().size(); i++) {
-            listStoreId.add(distribution.getListDetail().get(i).getStore().getId());
-        }
-        Map<String, Object> map = new HashMap<String, Object>();
-        map.put("storeId", listStoreId);
-        for(int i = 0 ;i < listStoreId.size();i++){
-            System.out.println(listStoreId.get(i));
-        }
-        List<StoreOfWareStack> listSows = storeMapper.selectWareStackByDistributionStore(map);
-
-        for (int m = 0; m < listSows.size(); m++) {
-
-
-            Stack stack = stackMapper.selectByPrimaryKey(listSows.get(m).getStackId());
-            Map<String, Object> mapParam = new HashMap<String, Object>();
-            mapParam.put("storeId", listStoreId);
-            mapParam.put("wareId", listSows.get(m).getWareId());
-            mapParam.put("stackId", listSows.get(m).getStackId());
-
-            List<Store> listStore = storeMapper.selectByWareIdStackIdInStoreId(mapParam);
-            if (stack.getIsLayer().equals("0") || stack.getIsLayer().equals("2")) {
-                for (int i = 0; i < listStore.size(); i++) {
-                    OutRecord outRecord = getOutRecord(listStore.get(i), distribution.getId(), "1", userId);
-                    num += outRecordMapper.insert(outRecord);
-                    AccountDetail accountDetail = getAccountDetail(listStore.get(i), distribution.getSumWeight(), distribution.getSuttle(), userId, belongId);
-                    num += accountDetailMapper.insert(accountDetail);
-                    listStore.get(i).setOutId(outRecord.getId());
-                    listStore.get(i).setOutFlag("1");
-                    num += storeMapper.updateByPrimaryKey(listStore.get(i));
-                }
-                result = Tools.moreThanZeroResultJSON(num);
-            } else {
-                Collections.sort(listStore);
-                int currentLayer = Integer.parseInt(storeMapper.selectLayerByStackId(listStore.get(0).getStack().getId(), belongId));
-                int min = listStore.get(0).getLayer();
-                int max = listStore.get(listStore.size() - 1).getLayer();
-//                if (currentLayer != max) {
-//                    throw new Exception("库房：" + listStore.get(m).getWare().getName() + ",垛位：" + listStore.get(m).getStack().getName() + ",出库物料不在最上层，无法出库！");
-//                    // result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "必须选择最上层出库！");
-//                } else if (!WareTools.checkOrder(listStore)) {
-//                    throw new Exception("库房：" + listStore.get(m).getWare().getName() + ",垛位：" + listStore.get(m).getStack().getName() + ",出库物料不在最上层，无法出库！");
-//                    //  result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "请选中连续数据移动！");
-//                } else {
-//
-//                }
-                for (int i = 0; i < listStore.size(); i++) {
-                    OutRecord outRecord = getOutRecord(listStore.get(i), distribution.getId(), "1", userId);
-                    num += outRecordMapper.insert(outRecord);
+        Distribution distribution = distributionMapper.selectByPrimaryKey(distribution1.getId());
+        if (distribution.getOutFlag().equals("1")){
+            return JSONTools.toString(1,"该车已出库，请勿重复操作");
+        }else{
+            distribution.setOutFlag("1");
+            num += distributionMapper.updateByPrimaryKey(distribution);
+            List<String> listStoreId = new ArrayList<String>();
+            for (int i = 0; i < distribution.getListDetail().size(); i++) {
+                listStoreId.add(distribution.getListDetail().get(i).getStore().getId());
+            }
+            Map<String, Object> map = new HashMap<String, Object>();
+            map.put("storeId", listStoreId);
+            for(int i = 0 ;i < listStoreId.size();i++){
+                System.out.println(listStoreId.get(i));
+            }
+            List<StoreOfWareStack> listSows = storeMapper.selectWareStackByDistributionStore(map);
+
+            for (int m = 0; m < listSows.size(); m++) {
+
 
-                    AccountDetail accountDetail = getAccountDetail(listStore.get(i), distribution.getSumWeight(), distribution.getSuttle(), userId, belongId);
-                    num += accountDetailMapper.insert(accountDetail);
+                Stack stack = stackMapper.selectByPrimaryKey(listSows.get(m).getStackId());
+                Map<String, Object> mapParam = new HashMap<String, Object>();
+                mapParam.put("storeId", listStoreId);
+                mapParam.put("wareId", listSows.get(m).getWareId());
+                mapParam.put("stackId", listSows.get(m).getStackId());
 
-                    listStore.get(i).setOutId(outRecord.getId());
-                    listStore.get(i).setOutFlag("1");
-                    num += storeMapper.updateByPrimaryKey(listStore.get(i));
+                List<Store> listStore = storeMapper.selectByWareIdStackIdInStoreId(mapParam);
+                if (stack.getIsLayer().equals("0") || stack.getIsLayer().equals("2")) {
+                    for (int i = 0; i < listStore.size(); i++) {
+                        OutRecord outRecord = getOutRecord(listStore.get(i), distribution.getId(), "1", userId);
+                        num += outRecordMapper.insert(outRecord);
+                        AccountDetail accountDetail = getAccountDetail(listStore.get(i), distribution.getSumWeight(), distribution.getSuttle(), userId, belongId);
+                        num += accountDetailMapper.insert(accountDetail);
+                        listStore.get(i).setOutId(outRecord.getId());
+                        listStore.get(i).setOutFlag("1");
+                        num += storeMapper.updateByPrimaryKey(listStore.get(i));
+                    }
+                    result = Tools.moreThanZeroResultJSON(num);
+                } else {
+                    Collections.sort(listStore);
+                    int currentLayer = Integer.parseInt(storeMapper.selectLayerByStackId(listStore.get(0).getStack().getId(), belongId));
+                    int min = listStore.get(0).getLayer();
+                    int max = listStore.get(listStore.size() - 1).getLayer();
+                    for (int i = 0; i < listStore.size(); i++) {
+                        OutRecord outRecord = getOutRecord(listStore.get(i), distribution.getId(), "1", userId);
+                        num += outRecordMapper.insert(outRecord);
 
+                        AccountDetail accountDetail = getAccountDetail(listStore.get(i), distribution.getSumWeight(), distribution.getSuttle(), userId, belongId);
+                        num += accountDetailMapper.insert(accountDetail);
+
+                        listStore.get(i).setOutId(outRecord.getId());
+                        listStore.get(i).setOutFlag("1");
+                        num += storeMapper.updateByPrimaryKey(listStore.get(i));
+
+                    }
+                    result = Tools.moreThanZeroResultJSON(num);
                 }
-                result = Tools.moreThanZeroResultJSON(num);
             }
         }
+
         return result;
     }
 

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

@@ -296,43 +296,53 @@ public class StoreServiceImpl implements StoreService {
 
 
             if (newContractno != null && !newContractno.equals("")){
-                list.get(i).setContractNo(newContractno);
-                inRecord.setContractNo(newContractno);
-            } else if (newContractno.equals("0")) {
-                list.get(i).setContractNo("");
-                inRecord.setContractNo("");
+                if (newContractno.equals("0")) {
+                    list.get(i).setContractNo("");
+                    inRecord.setContractNo("");
+                }else {
+                    list.get(i).setContractNo(newContractno);
+                    inRecord.setContractNo(newContractno);
+                }
             }
 
             if (newOrdno != null && !newOrdno.equals("")){
-                list.get(i).setOrdNo(newOrdno);
-                inRecord.setOrdNo(newOrdno);
-            } else if (newOrdno.equals("0")) {
-                list.get(i).setOrdNo("");
-                inRecord.setOrdNo("");
+                if (newOrdno.equals("0")) {
+                    list.get(i).setOrdNo("");
+                    inRecord.setOrdNo("");
+                }else {
+                    list.get(i).setOrdNo(newOrdno);
+                    inRecord.setOrdNo(newOrdno);
+                }
             }
 
             if (newReceiveaddress != null && !newReceiveaddress.equals("")){
-                list.get(i).setReceiveAddress(newReceiveaddress);
-                inRecord.setReceiveAddress(newReceiveaddress);
-            } else if (newReceiveaddress.equals("0")) {
-                list.get(i).setReceiveAddress("");
-                inRecord.setReceiveAddress("");
+                if (newReceiveaddress.equals("0")){
+                    list.get(i).setReceiveAddress("");
+                    inRecord.setReceiveAddress("");
+                }else {
+                    list.get(i).setReceiveAddress(newReceiveaddress);
+                    inRecord.setReceiveAddress(newReceiveaddress);
+                }
             }
 
             if (newProductionplace != null && !newProductionplace.equals("")){
-                list.get(i).setProductionPlace(newProductionplace);
-                inRecord.setProductionPlace(newProductionplace);
-            } else if (newProductionplace.equals("0")) {
-                list.get(i).setProductionPlace("");
-                inRecord.setProductionPlace("");
+                if (newProductionplace.equals("0")) {
+                    list.get(i).setProductionPlace("");
+                    inRecord.setProductionPlace("");
+                }else {
+                    list.get(i).setProductionPlace(newProductionplace);
+                    inRecord.setProductionPlace(newProductionplace);
+                }
             }
 
-            if (newPackno != null && !newPackno.equals("")){
-                list.get(i).setPackNo(newPackno);
-                inRecord.setPackNo(newPackno);
-            } else if (newPackno.equals("0")) {
-                list.get(i).setPackNo("");
-                inRecord.setPackNo("");
+            if (newPackno != null && !newPackno.equals("")) {
+                if (newPackno.equals("0")) {
+                    list.get(i).setPackNo("");
+                    inRecord.setPackNo("");
+                } else {
+                    list.get(i).setPackNo(newPackno);
+                    inRecord.setPackNo(newPackno);
+                }
             }
             num += storeMapper.updateByPrimaryKey(list.get(i));
 

src/main/resource/localhost/db.properties

@@ -1,13 +1,13 @@
-jdbc.driverClass=com.mysql.jdbc.Driver
-jdbc.jdbcUrl=jdbc:mysql://172.18.200.32:3306/ware_zg?characterEncoding=utf8
-jdbc.user=root
-jdbc.password=root
-
 #jdbc.driverClass=com.mysql.jdbc.Driver
-#jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_zg?characterEncoding=utf8
+#jdbc.jdbcUrl=jdbc:mysql://172.18.200.32:3306/ware_zg?characterEncoding=utf8
 #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.user=root