1111

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

@@ -185,4 +185,23 @@ public class StoreController {
         }
     }
 
+    @RequestMapping(value = "/changeStack.do")
+    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,newRemark,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/StoreServiceImpl.java

@@ -5,16 +5,16 @@ import com.alibaba.fastjson.TypeReference;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.th.demo.mapping.maint.CustomerMapper;
+import com.th.demo.mapping.maint.StackMapper;
 import com.th.demo.mapping.ware.ChangeRecordMapper;
 import com.th.demo.mapping.ware.InRecordMapper;
+import com.th.demo.mapping.ware.MoveRecordMapper;
 import com.th.demo.mapping.ware.StoreMapper;
 import com.th.demo.model.maint.Customer;
 import com.th.demo.model.maint.Stack;
+import com.th.demo.model.system.SysUser;
 import com.th.demo.model.system.Type;
-import com.th.demo.model.ware.ChangeRecord;
-import com.th.demo.model.ware.InRecord;
-import com.th.demo.model.ware.SplitRecord;
-import com.th.demo.model.ware.Store;
+import com.th.demo.model.ware.*;
 import com.th.demo.service.maint.CustomerService;
 import com.th.demo.service.ware.StoreService;
 import com.th.demo.tools.JSONTools;
@@ -39,6 +39,10 @@ public class StoreServiceImpl implements StoreService {
     public CustomerMapper customerMapper;
     @Autowired//自动注入Mapper
     public InRecordMapper inRecordMapper;
+    @Autowired//自动注入Mapper
+    public MoveRecordMapper moveRecordMapper;
+    @Autowired//自动注入Mapper
+    public StackMapper stackMapper;
     String result = Type.FAIL;
     int num = 0;
 
@@ -338,4 +342,71 @@ public class StoreServiceImpl implements StoreService {
         }
         return Tools.moreThanZeroResultJSON(num);
     }
+
+    @Override
+    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;
+        int layerOld = 0;
+        int layer = 0;
+        if (!newWare.equals("") && newWare!=null && !newStack.equals("") && newStack!=null){
+            Stack toStack = stackMapper.selectByWareNameStackName(newWare,newStack,userId,belongId);
+            int currentLayer = Integer.parseInt(storeMapper.selectLayerByStackId(toStack.getId(), belongId));
+            if (toStack==null){
+                return JSONTools.toString(1,"没有找到该垛位信息");
+            }else{
+                for (int i = 0; i < listStore.size(); i++) {
+                    layerOld = listStore.get(i).getLayer();
+
+                    if (toStack.getIsLayer().equals("0")) {
+                        layerNew = 0;
+                    } else if (toStack.getIsLayer().equals("1")) {
+                        layerNew = currentLayer + 1 + i;
+                    } else if (toStack.getIsLayer().equals("2")) {
+                        layerNew = layer;
+                    }
+
+                    MoveRecord moveRecord = getMoveRecord(listStore.get(i), listStore.get(i).getStack(), toStack, layerNew, layerOld, userId);
+
+                    listStore.get(i).setWare(toStack.getWare());
+                    listStore.get(i).setStack(toStack);
+                    listStore.get(i).setLayer(layerNew);
+                    num = moveRecordMapper.insert(moveRecord);
+
+                    num += storeMapper.updateByPrimaryKey(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());
+        moveRecord.setWareNameNew(toStack.getWare().getName());
+        moveRecord.setStackNameOld(fromStack.getName());
+        moveRecord.setStackNameNew(toStack.getName());
+        moveRecord.setLayerOld(layerOld);
+        moveRecord.setLayerNew(layerNew);
+        moveRecord.setMaterialName(store.getMaterial().getName());
+        // moveRecord.setMaterialNo(store.getMaterialNo());
+        moveRecord.setStandard(store.getMaterial().getStandard());
+        moveRecord.setModel(store.getModel());
+        moveRecord.setCustomerName(store.getCustomer().getName());
+        // moveRecord.setCustomerNo(store.getCustomerNo());
+        moveRecord.setCount(store.getCount());
+        moveRecord.setWeight(store.getWeight());
+        moveRecord.setRemark(store.getRemark());
+        moveRecord.setBelongId(store.getBelongId());
+        moveRecord.setPlateNo(store.getPlateNo());
+        moveRecord.setAddUser(new SysUser(userId));
+        moveRecord.setAddTime(new Date());
+        moveRecord.setReceiveAddress(store.getReceiveAddress());
+        moveRecord.setWgtDcnMtcCd(store.getWgtDcnMtcCd());
+        moveRecord.setEdgeTy(store.getEdgeTy());
+        moveRecord.setProductionPlace(store.getProductionPlace());
+        moveRecord.setCancelFlag("0");
+        return moveRecord;
+    }
 }

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

@@ -30,4 +30,6 @@ public interface StoreService {
                      String userId,
                      String belongId);
 
+    String changeStack(String json,String newWare,String newStack,String newRemark1,
+                       String newRemark, String userId,String belongId);
 }

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