同步程序2.0

pom.xml

@@ -549,7 +549,7 @@
     </profiles>
 
     <build>
-        <finalName>thware</finalName>
+        <finalName>thware_mj</finalName>
         <resources>
             <resource>
                 <directory>src/main/resource</directory>

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

@@ -230,12 +230,12 @@ public class InServiceImpl implements InService {
             listSameStack.get(m).setAddTime(new Date());
             listSameStack.get(m).setCancelFlag("0");
             listSameStack.get(m).setBelongId(belongId);
-            Price = priceMapper.selectByMaterialChangeTime(listSameStack.get(m).getFkComponyId().toString(),belongId);
+            /*Price = priceMapper.selectByMaterialChangeTime(listSameStack.get(m).getFkComponyId().toString(),belongId);
             if(Price == null){
                 Customer fk_compony = customerMapper.selectByPrimaryKey(listSameStack.get(m).getFkComponyId());
                 throw new Exception(fk_compony.getName()+"公司的价格未维护");
             }
-            listSameStack.get(m).setInvoicePrice(Price.getOrdPrice());
+            listSameStack.get(m).setInvoicePrice(Price.getOrdPrice());*/
             InRecord inRecord = getInRecord(listSameStack.get(m), "1", userId);
             num += inRecordMapper.insert(inRecord);
 
@@ -251,12 +251,12 @@ 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 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();
+        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 + "\"的库房；";
@@ -279,15 +279,15 @@ public class InServiceImpl implements InService {
         }
         Customer fk_compony = customerMapper.selectByName(fk_compony_name, belongId);
         if (fk_compony == null) {
-            err += "未找到名为\"" + customerName + "\"的货权单位；";
+            err += "未找到名为\"" + customerName + "\"的货主单位；";
             throw new Exception(err);
         }
         for (int i = 0; i < listJO.size(); i++) {
             Store store = new Store();
-            if (listJO.get(i).get("仓库名称").toString().equals(wareName)) {
+            if (listJO.get(i).get("仓库").toString().equals(wareName)) {
                 store.setWare(ware);
             } else {
-                wareName = listJO.get(i).get("仓库名称").toString();
+                wareName = listJO.get(i).get("仓库").toString();
                 ware = wareMapper.selectByWareName(wareName, userId, belongId);
                 if (ware == null) {
                     err += "未找到名为\"" + wareName + "\"的仓库名称；";
@@ -295,21 +295,21 @@ public class InServiceImpl implements InService {
                 }
                 store.setWare(ware);
             }
-            if (listJO.get(i).get("垛位号").toString().equals(stackName)) {
+            if (listJO.get(i).get("垛位").toString().equals(stackName)) {
                 store.setStack(stack);
             } else {
-                stackName = listJO.get(i).get("垛位号").toString();
+                stackName = listJO.get(i).get("垛位").toString();
                 stack = stackMapper.selectByWareNameStackName(wareName, stackName, userId, belongId);
                 if (stack == null) {
-                    err += "未找到名为\"" + stackName + "\"的垛位号；";
+                    err += "未找到名为\"" + stackName + "\"的垛位；";
                     throw new Exception(err);
                 }
                 store.setStack(stack);
             }
-            if (listJO.get(i).get("货物品名").toString().equals(materialName) && listJO.get(i).get("材质").toString().equals(standard)) {
+            if (listJO.get(i).get("品名").toString().equals(materialName) && listJO.get(i).get("材质").toString().equals(standard)) {
                 store.setMaterial(material);
             } else {
-                materialName = listJO.get(i).get("货物品名").toString();
+                materialName = listJO.get(i).get("品名").toString();
                 standard = listJO.get(i).get("材质").toString();
                 material = materialMapper.selectByNameStandard(materialName, standard, belongId);
                 if (material == null) {
@@ -318,10 +318,10 @@ public class InServiceImpl implements InService {
                 }
                 store.setMaterial(material);
             }
-            if (listJO.get(i).get("订单客户").toString().equals(customerName)) {
+            if (listJO.get(i).get("货主").toString().equals(customerName)) {
                 store.setCustomer(customer);
             } else {
-                customerName = listJO.get(i).get("订单客户").toString();
+                customerName = listJO.get(i).get("货主").toString();
                 customer = customerMapper.selectByName(customerName, belongId);
                 if (customer == null) {
                     err += "未找到名为\"" + customerName + "\"的订单客户名称；";
@@ -329,10 +329,10 @@ public class InServiceImpl implements InService {
                 }
                 store.setCustomer(customer);
             }
-            if (listJO.get(i).get("客户名称").toString().equals(fk_compony_name)) {
+            if (listJO.get(i).get("货主").toString().equals(fk_compony_name)) {
                 store.setFkComponyId(fk_compony.getId());
             } else {
-                fk_compony_name = listJO.get(i).get("客户名称").toString();
+                fk_compony_name = listJO.get(i).get("货主").toString();
                 fk_compony = customerMapper.selectByName(fk_compony_name, belongId);
                 if (customer == null) {
                     err += "未找到名为\"" + customerName + "\"的客户名称；";
@@ -340,19 +340,22 @@ public class InServiceImpl implements InService {
                 }
                 store.setFkComponyId(fk_compony.getId());
             }
-            store.setLayer(Integer.parseInt(listJO.get(i).get("层号").toString()));
-            store.setPlateNo(listJO.get(i).get("顺序号").toString());
+            //store.setLayer(Integer.parseInt(listJO.get(i).get("层号").toString()));
+            store.setPlateNo(listJO.get(i).get("产品编号").toString());
             store.setModel(listJO.get(i).get("规格").toString());
             store.setCount(Double.parseDouble(listJO.get(i).get("数量").toString()));
             store.setWeight(Double.parseDouble(listJO.get(i).get("重量").toString()));
-            if (listJO.get(i).get("目的地") == null || listJO.get(i).get("目的地").toString().equals("")) {
+            /*if (listJO.get(i).get("目的地") == null || listJO.get(i).get("目的地").toString().equals("")) {
                 store.setReceiveAddress(customer.getAddress());
             } else {
                 store.setReceiveAddress(listJO.get(i).get("目的地").toString());
-            }
+            }*/
             if(listJO.get(i).get("备注") != null){
                 store.setRemark(listJO.get(i).get("备注").toString());
             }
+            if(listJO.get(i).get("计重方式") != null){
+                store.setWgtDcnMtcCd(listJO.get(i).get("计重方式").toString());
+            }
 
             store.setAddId(userId);
             store.setAddTime(new Date());
@@ -369,12 +372,12 @@ public class InServiceImpl implements InService {
             if(listJO.get(i).get("合约号") != null){
                 store.setContractNo(listJO.get(i).get("合约号").toString());
             }
-            if(listJO.get(i).get("车号") != null){
-                store.setCarNo(listJO.get(i).get("车号").toString());
+            if(listJO.get(i).get("入库车号") != null){
+                store.setCarNo(listJO.get(i).get("入库车号").toString());
             }
-            if(listJO.get(i).get("吊装工") != null){
+            /*if(listJO.get(i).get("吊装工") != null){
                 store.setTallyPeople(listJO.get(i).get("吊装工").toString());
-            }
+            }*/
             listStore.add(store);
         }
         if (err.equals(Type.SUCCESS)) {

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

@@ -301,7 +301,7 @@ public class OutServiceImpl implements OutService {
         outRecord.setEdgeTy(store.getEdgeTy());
         outRecord.setProductionPlace(store.getProductionPlace());
         InRecord inRecord = inRecordMapper.selectByPrimaryKey(store.getInId());
-        double asd = (outRecord.getAddTime().getDate() - inRecord.getAddTime().getTime())/ (24 * 60 * 60 * 1000);
+        /*double asd = (outRecord.getAddTime().getDate() - inRecord.getAddTime().getTime())/ (24 * 60 * 60 * 1000);
         Price price = priceMapper.selectByMaterialChangeTime(store.getFkComponyId(),store.getBelongId());
         if (asd > price.getKeepDay()){
             outRecord.setInvoicePrice(price.getOutOrdPrice());
@@ -309,7 +309,7 @@ public class OutServiceImpl implements OutService {
         }else {
             outRecord.setInvoicePrice(price.getOrdPrice());
             outRecord.setUnitPrice(price.getOrdPrice());
-        }
+        }*/
 
 
 

src/main/resource/localhost/db.properties

@@ -1,10 +1,15 @@
 #jdbc.driverClass=com.mysql.jdbc.Driver
-#jdbc.jdbcUrl=jdbc:mysql://172.18.200.32:3306/ware?useUnicode=true&characterEncoding=utf8
+#jdbc.jdbcUrl=jdbc:mysql://172.18.200.32:3306/ware_mj?useUnicode=true&characterEncoding=utf8
 #jdbc.user=root
 #jdbc.password=root
 
 #???????????????????????????????
 jdbc.driverClass=com.mysql.jdbc.Driver
-jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware?characterEncoding=utf8
+jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_mj?characterEncoding=utf8
 jdbc.user=root
-jdbc.password=root
+jdbc.password=root
+
+#jdbc.driverClass=com.mysql.jdbc.Driver
+#jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/thware?useUnicode=true&characterEncoding=utf8
+#jdbc.user=root
+#jdbc.password=122403