1111

src/main/java/com/th/demo/controller/ware/StoreController.java

@@ -163,12 +163,15 @@ public class StoreController {
     }
 
     @RequestMapping(value = "/changeStack.do")
-    public String changeStack(String json,String newWare,String newStack,String newRemark1,HttpServletRequest request) {
+    public String changeStack(String json,String newWare,String newStack,
+                              String newRemark1,
+                              String newRemark,
+                              HttpServletRequest request) {
 
         try {
             String userId = (String) request.getAttribute("userId");
             String belongId = (String) request.getAttribute("belongId");
-            result=storeService.changeStack(json,newWare,newStack,newRemark1,userId,belongId);
+            result=storeService.changeStack(json,newWare,newStack,newRemark1,newRemark,userId,belongId);
 
         } catch (Exception ex) {
             ex.printStackTrace();
@@ -178,4 +181,22 @@ public class StoreController {
         }
     }
 
+    @RequestMapping(value = "/changeCustName.do")
+    public String changeCustName(String json,
+                              String newCustomername,
+                              String newFKCustomername,
+                              HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result=storeService.changeCustName(json,newCustomername,newFKCustomername,userId,belongId);
+
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
 }

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

@@ -395,7 +395,11 @@ public class InServiceImpl implements InService {
             }else {
                 store.setRemark1("");
             }
-
+            if (listJO.get(i).get("收货地址") == null || listJO.get(i).get("收货地址").toString().equals("")) {
+                store.setReceiveAddress("");
+            }else {
+                store.setReceiveAddress(listJO.get(i).get("收货地址").toString());
+            }
             /*if (listJO.get(i).get("目的地") == null || listJO.get(i).get("目的地").toString().equals("")) {
                 store.setReceiveAddress(customer.getAddress());
             } else {

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

@@ -42,6 +42,8 @@ public class StoreServiceImpl implements StoreService {
     public StackMapper stackMapper;
     @Autowired//自动注入Mapper
     public MoveRecordMapper moveRecordMapper;
+    @Autowired//自动注入Mapper
+    public CustomerMapper customerMapper;
     String result = Type.FAIL;
     int num = 0;
 
@@ -249,7 +251,8 @@ public class StoreServiceImpl implements StoreService {
 //    }
 
     @Override
-    public String changeStack(String json,String newWare,String newStack,String newRemark1,String userId,String belongId) {
+    public String changeStack(String json,String newWare,String newStack,String newRemark1,
+                              String newRemark,String userId,String belongId) {
         List<Store> listStore = JSON.parseObject(json, new TypeReference<List<Store>>() {});
 
         int layerNew = 0;
@@ -293,11 +296,48 @@ public class StoreServiceImpl implements StoreService {
                     listStore.get(i).setRemark1(newRemark1);
                 }
             }
+            if (!newRemark.equals("") && newRemark!=null){
+                if (newRemark.equals("0")){
+                    listStore.get(i).setRemark("");
+                }else {
+                    listStore.get(i).setRemark(newRemark);
+                }
+            }
             num = storeMapper.updateByPrimaryKey(listStore.get(i));
         }
         return result;
     }
 
+    @Override
+    public String changeCustName(String json,String newCustomername,String newFKCustomername,
+                          String userId,String belongId) {
+        List<Store> listStore = JSON.parseObject(json, new TypeReference<List<Store>>() {});
+
+        int layerNew = 0;
+        int layerOld = 0;
+        int layer = 0;
+        Customer customer = new Customer();
+        Customer fkcustomer = new Customer();
+        if (!newCustomername.equals("") && newCustomername!=null){
+            customer = customerMapper.selectByName(newCustomername,belongId);
+        }
+        if (!newFKCustomername.equals("") && newFKCustomername!=null){
+            fkcustomer = customerMapper.selectByName(newFKCustomername,belongId);
+        }
+        for (int i = 0; i < listStore.size(); i++) {
+            if (!newCustomername.equals("") && newCustomername!=null){
+                listStore.get(i).setCustomer(customer);
+                num = storeMapper.updateByPrimaryKey(listStore.get(i));
+            }
+            if (!newFKCustomername.equals("") && newFKCustomername!=null){
+                listStore.get(i).setFkComponyId(fkcustomer.getId());
+                num = storeMapper.updateFkById(listStore.get(i));
+            }
+
+        }
+        return result;
+    }
+
     private MoveRecord getMoveRecord(Store store, Stack fromStack, Stack toStack, int layerNew, int layerOld, String userId) {
         MoveRecord moveRecord = new MoveRecord();
         moveRecord.setWareNameOld(fromStack.getWare().getName());

src/main/java/com/th/demo/service/ware/StoreService.java

@@ -18,5 +18,9 @@ public interface StoreService {
 
     String modifyCustomeradress(String id,String customerAddressOld,String customerAddressNew);
 
-    String changeStack(String json,String newWare,String newStack,String newRemark1,String userId,String belongId);
+    String changeStack(String json,String newWare,String newStack,String newRemark1,
+                       String newRemark, String userId,String belongId);
+
+    String changeCustName(String json,String newCustomername,String newFKCustomername,
+                          String userId,String belongId);
 }

src/main/resource/localhost/db.properties

@@ -4,12 +4,12 @@
 #jdbc.password=root
 
 #???????????????????????????????
-#jdbc.driverClass=com.mysql.jdbc.Driver
-#jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_mj?characterEncoding=utf8
-#jdbc.user=root
-#jdbc.password=root
-
 jdbc.driverClass=com.mysql.jdbc.Driver
-jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/ware_mj?useUnicode=true&characterEncoding=utf8
+jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_mj?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_mj?useUnicode=true&characterEncoding=utf8
+#jdbc.user=root
+#jdbc.password=122403