1111

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

@@ -423,137 +423,69 @@ public class InServiceImpl implements InService {
     private List<Store> objToStore(List<JSONObject> listJO, String userId, String belongId) throws Exception {
         String err = Type.SUCCESS;
         List<Store> listStore = new ArrayList<>();
-        String wareName = listJO.get(0).get("仓库名称").toString();
-        String stackName = listJO.get(0).get("垛位号").toString();
-        String materialName = listJO.get(0).get("品名").toString();
-        String standard = listJO.get(0).get("钢种").toString();
-        String customerName = listJO.get(0).get("客户名称").toString();
-        String fk_compony_name = listJO.get(0).get("货权单位").toString();
-        //验证信息增加多条信息验证
-        Ware ware = wareMapper.selectByWareName(wareName, userId, belongId);
-        if (ware == null) {
-            err += "未找到名为\"" + wareName + "\"的库房；";
-            throw new Exception(err);
-        }
-        Stack stack = stackMapper.selectByWareNameStackName(wareName, stackName, userId, belongId);
-        if (stack == null) {
-            err += "未找到名为\"" + stackName + "\"的垛位号；";
-            throw new Exception(err);
-        }
-        // 将传入的材料品名和钢种进行校验
-        Material material = new Material();
-        List<Material> materialList = materialMapper.selectListByNameStandard(materialName, standard, belongId);
-        if (materialList.size() == 0 ){
-            err += "未找到名为\"" + materialName + "，" + standard + "\"的物料类型；";
-            throw new Exception(err);
-        } else if (materialList.size() > 1) {
-            err += "名为\"" + materialName + "，" + standard + "\"的物料类型维护多条；";
-            throw new Exception(err);
-        }else {
-            material= materialList.get(0);
-        }
-
-        // 将传入的客户名称进行校验
-        Customer customer = new Customer();
-        List<Customer> customerList = customerMapper.selectByNameCode(customerName,customerName,belongId);
-        if (customerList.size() == 0){
-            err += "未找到全名或简称为\"" + customerName + "\"的客户名称；";
-            throw new Exception(err);
-        } else if (customerList.size() > 1) {
-            err += "全名或简称为\"" + customerName + "\"的客户名称维护多条；";
-            throw new Exception(err);
-        }else{
-            customer = customerList.get(0);
-        }
-
-        // 将传入的客户名称进行校验
-        Customer fk_compony = new Customer();
-        List<Customer> customerList2 = customerMapper.selectByNameCode(fk_compony_name,fk_compony_name,belongId);
-        if (customerList2.size() == 0){
-            err += "未找到全名或简称为\"" + fk_compony_name + "\"的客户名称；";
-            throw new Exception(err);
-        } else if (customerList2.size() > 1) {
-            err += "全名或简称为\"" + fk_compony_name + "\"的客户名称维护多条；";
-            throw new Exception(err);
-        }else{
-            fk_compony = customerList2.get(0);
-        }
+        String wareName = ""; Ware ware = new Ware();
+        String stackName = "";Stack stack = new Stack();
+        String materialName = ""; String standard = ""; List<Material> materialList;
 
-//        //检查入库操作人
-//        SysUser sysUser = new SysUser();
-//        List<SysUser> sysUserList = sysUserMapper.selectUser(addUserName,"");
+        String customerName = "";List<Customer> customerList;
+        String fk_compony_name = "";List<Customer> customerList2;
 
         for (int i = 0; i < listJO.size(); i++) {
             Store store = new Store();
-            if (listJO.get(i).get("仓库名称").toString().equals(wareName)) {
-                store.setWare(ware);
-            } else {
-                wareName = listJO.get(i).get("仓库名称").toString();
-                ware = wareMapper.selectByWareName(wareName, userId, belongId);
-                if (ware == null) {
-                    err += "未找到名为\"" + wareName + "\"的仓库名称；";
-                    throw new Exception(err);
-                }
+            wareName = listJO.get(i).get("仓库名称").toString();
+            ware = wareMapper.selectByWareName(wareName, userId, belongId);
+            if (ware == null) {
+                err += "未找到名为\"" + wareName + "\"的仓库名称；";
+                throw new Exception(err);
+            }else {
                 store.setWare(ware);
             }
-            if (listJO.get(i).get("垛位号").toString().equals(stackName)) {
-                store.setStack(stack);
-            } else {
-                stackName = listJO.get(i).get("垛位号").toString();
-                stack = stackMapper.selectByWareNameStackName(wareName, stackName, userId, belongId);
-                if (stack == null) {
-                    err += "未找到名为\"" + stackName + "\"的垛位号；";
-                    throw new Exception(err);
-                }
+
+            stackName = listJO.get(i).get("垛位号").toString();
+            stack = stackMapper.selectByWareNameStackName(wareName, stackName, userId, belongId);
+            if (stack == null) {
+                err += "未找到名为\"" + stackName + "\"的垛位号；";
+                throw new Exception(err);
+            }else {
                 store.setStack(stack);
             }
-            if (listJO.get(i).get("品名").toString().equals(materialName) && listJO.get(i).get("钢种").toString().equals(standard)) {
-                store.setMaterial(material);
-            } else {
-                materialList = materialMapper.selectListByNameStandard(listJO.get(i).get("品名").toString(), listJO.get(i).get("钢种").toString(), belongId);
-                if (materialList.size() == 0 ){
-                    err += "未找到名为\"" + listJO.get(i).get("品名").toString() + "，" + listJO.get(i).get("钢种").toString() + "\"的物料类型；";
-                    throw new Exception(err);
-                } else if (materialList.size() > 1) {
-                    err += "名为\"" + listJO.get(i).get("品名").toString() + "，" + listJO.get(i).get("钢种").toString() + "\"的物料类型维护多条；";
-                    throw new Exception(err);
-                }else {
-                    store.setMaterial(materialList.get(0));
-                }
-            }
 
-            if (listJO.get(i).get("客户名称").toString().equals(customerName)) {
-                store.setCustomer(customer);
-            } else {
-                customerName = listJO.get(i).get("客户名称").toString();
-                customerList = customerMapper.selectByNameCode(customerName,customerName,belongId);
-                if (customerList.size() == 0){
-                    err += "未找到全名或简称为\"" + customerName + "\"的客户名称；";
-                    throw new Exception(err);
-                } else if (customerList.size() > 1) {
-                    err += "全名或简称为\"" + customerName + "\"的客户名称维护多条；";
-                    throw new Exception(err);
-                }else{
-                    store.setCustomer(customerList.get(0));
-                }
+
+            materialList = materialMapper.selectListByNameStandard(listJO.get(i).get("品名").toString(), listJO.get(i).get("钢种").toString(), belongId);
+            if (materialList.size() == 0 ){
+                err += "未找到名为\"" + listJO.get(i).get("品名").toString() + "，" + listJO.get(i).get("钢种").toString() + "\"的物料类型；";
+                throw new Exception(err);
+            } else if (materialList.size() > 1) {
+                err += "名为\"" + listJO.get(i).get("品名").toString() + "，" + listJO.get(i).get("钢种").toString() + "\"的物料类型维护多条；";
+                throw new Exception(err);
+            }else {
+                store.setMaterial(materialList.get(0));
             }
 
-            if (listJO.get(i).get("货权单位").toString().equals(fk_compony_name)) {
-                store.setFkComponyId(fk_compony.getId());
-            } else {
-                fk_compony_name = listJO.get(i).get("货权单位").toString();
-                customerList2 = customerMapper.selectByNameCode(fk_compony_name,fk_compony_name,belongId);
-                if (customerList2.size() == 0){
-                    err += "未找到全名或简称为\"" + fk_compony_name + "\"的客户名称；";
-                    throw new Exception(err);
-                } else if (customerList2.size() > 1) {
-                    err += "全名或简称为\"" + fk_compony_name + "\"的客户名称维护多条；";
-                    throw new Exception(err);
-                }else {
-                    store.setFkComponyId(customerList2.get(0).getId());
-                }
+            customerName = listJO.get(i).get("客户名称").toString();
+            customerList = customerMapper.selectByNameCode(customerName,customerName,belongId);
+            if (customerList.size() == 0){
+                err += "未找到全名或简称为\"" + customerName + "\"的客户名称；";
+                throw new Exception(err);
+            } else if (customerList.size() > 1) {
+                err += "全名或简称为\"" + customerName + "\"的客户名称维护多条；";
+                throw new Exception(err);
+            }else{
+                store.setCustomer(customerList.get(0));
+            }
 
+            fk_compony_name = listJO.get(i).get("货权单位").toString();
+            customerList2 = customerMapper.selectByNameCode(fk_compony_name,fk_compony_name,belongId);
+            if (customerList2.size() == 0){
+                err += "未找到全名或简称为\"" + fk_compony_name + "\"的客户名称；";
+                throw new Exception(err);
+            } else if (customerList2.size() > 1) {
+                err += "全名或简称为\"" + fk_compony_name + "\"的客户名称维护多条；";
+                throw new Exception(err);
+            }else {
+                store.setFkComponyId(customerList2.get(0).getId());
             }
+
             store.setLayer(Integer.parseInt(listJO.get(i).get("层号").toString()));
             store.setPlateNo(listJO.get(i).get("产品编号").toString());
             store.setModel(listJO.get(i).get("规格型号").toString());
@@ -581,11 +513,16 @@ public class InServiceImpl implements InService {
             }
             if(listJO.get(i).get("合约号") != null && !listJO.get(i).get("合约号").toString().equals("")){
                 store.setContractNo(listJO.get(i).get("合约号").toString());
+            }else {
+                store.setContractNo("");
             }
 
             if(listJO.get(i).get("订单号") != null && !listJO.get(i).get("订单号").toString().equals("")){
                 store.setOrdNo(listJO.get(i).get("订单号").toString());
+            }else {
+                store.setOrdNo("");
             }
+
             if(listJO.get(i).get("入库车号") != null && !listJO.get(i).get("入库车号").toString().equals("")){
                 store.setCarNo(listJO.get(i).get("入库车号").toString());
             }
@@ -594,6 +531,8 @@ public class InServiceImpl implements InService {
             }
             if(listJO.get(i).get("捆包号") != null && !listJO.get(i).get("捆包号").toString().equals("")){
                 store.setPackNo(listJO.get(i).get("捆包号").toString());
+            }else {
+                store.setPackNo("");
             }
             listStore.add(store);
         }

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