111

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

@@ -162,4 +162,20 @@ public class StoreController {
         }
     }
 
+    @RequestMapping(value = "/changeStack.do")
+    public String changeStack(String json,String newWare,String newStack,String newRemark1,HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result=storeService.changeStack(json,newWare,newStack,newRemark1,userId,belongId);
+
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
+
 }

src/main/java/com/th/demo/mapping/ware/StoreMapper.java

@@ -53,4 +53,6 @@ public interface StoreMapper {
     int selEffStore(String plateNo);
 
     void updateByOutId(String id, String noUserParam, String userId, String belongId);
+
+    int updateFkById(Store store);
 }

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

@@ -64,7 +64,8 @@ public class ChangeServiceImpl implements ChangeService {
         double sum_weight = 0;//可以进行货权转移的重量(货权转移的地方维护的)
         double use_weight = 0;//已经使用的货权转移的重量
         // 增加校验
-        Customer fk_cus = customerMapper.selectByPrimaryKey(list.get(0).getCustomer().getId());//老货主
+        Store store = storeMapper.selectByPrimaryKey(list.get(0).getId());
+        Customer fk_cus = customerMapper.selectByPrimaryKey(store.getCustomer().getId());//老货主
         Cargo cargo = cargoMapper.selectByByFkAndCustomer(fk_cus.getId(),c.getId(),belongId);
         if (cargo == null){
             sum_weight=0;
@@ -91,6 +92,7 @@ public class ChangeServiceImpl implements ChangeService {
             list.get(i).setFkComponyId(fk_cus.getId());
             list.get(i).setReceiveAddress(address);
             num += storeMapper.updateByPrimaryKey(list.get(i));
+            num += storeMapper.updateFkById(list.get(i));
             use_weight = use_weight + list.get(i).getWeight();
         }
         if (sum_weight != 0){
@@ -112,8 +114,6 @@ public class ChangeServiceImpl implements ChangeService {
             result = Tools.moreThanZeroResultJSON(num);
         }
 
-
-
         return Tools.moreThanZeroResultJSON(num);
     }
 

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

@@ -5,15 +5,20 @@ 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.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.MoveRecord;
 import com.th.demo.model.ware.SplitRecord;
 import com.th.demo.model.ware.Store;
 import com.th.demo.service.maint.CustomerService;
+import com.th.demo.service.ware.MoveService;
 import com.th.demo.service.ware.StoreService;
 import com.th.demo.tools.JSONTools;
 import com.th.demo.tools.Tools;
@@ -33,6 +38,10 @@ public class StoreServiceImpl implements StoreService {
     public ChangeRecordMapper changeRecordMapper;
     @Autowired//自动注入Mapper
     public StoreMapper storeMapper;
+    @Autowired//自动注入Mapper
+    public StackMapper stackMapper;
+    @Autowired//自动注入Mapper
+    public MoveRecordMapper moveRecordMapper;
     String result = Type.FAIL;
     int num = 0;
 
@@ -86,7 +95,7 @@ public class StoreServiceImpl implements StoreService {
                              String fkcustmerName,
                              String userId,
                              String belongId) {
-        PageHelper.startPage(page, rows);
+
         List<String> pltNos =new ArrayList<>() ;
         List<String> ordNos =new ArrayList<>() ;
         if (plateNo.indexOf(",") != -1){
@@ -100,6 +109,7 @@ public class StoreServiceImpl implements StoreService {
                 customerName, plateNo,ordNo, pltNos,ordNos, userId,belongId,remark1,fkcustmerName);
 
         if(page != -1){
+            PageHelper.startPage(page, rows);
             PageInfo<Store> pageInfo = new PageInfo<>(list);
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
         }else {
@@ -237,4 +247,83 @@ public class StoreServiceImpl implements StoreService {
 //        return result;
 //
 //    }
+
+    @Override
+    public String changeStack(String json,String newWare,String newStack,String newRemark1,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;
+                    }
+
+                    listStore.get(i).setWare(toStack.getWare());
+                    listStore.get(i).setStack(toStack);
+                    listStore.get(i).setLayer(layerNew);
+
+
+                    MoveRecord moveRecord = getMoveRecord(listStore.get(i), listStore.get(i).getStack(), toStack, layerNew, layerOld, userId);
+                    num = moveRecordMapper.insert(moveRecord);
+
+                    num += storeMapper.updateByPrimaryKey(listStore.get(i));
+                }
+            }
+        }
+
+        for (int i = 0; i < listStore.size(); i++) {
+            if (!newRemark1.equals("") && newRemark1!=null){
+                if (newRemark1.equals("0")){
+                    listStore.get(i).setRemark1("");
+                }else {
+                    listStore.get(i).setRemark1(newRemark1);
+                }
+            }
+            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

@@ -17,4 +17,6 @@ public interface StoreService {
     String modifyCustomer(String id,String customerNameOld,String customerNameNew);
 
     String modifyCustomeradress(String id,String customerAddressOld,String customerAddressNew);
+
+    String changeStack(String json,String newWare,String newStack,String newRemark1,String userId,String belongId);
 }

src/main/resource/localhost/db.properties

@@ -1,14 +1,14 @@
-jdbc.driverClass=com.mysql.jdbc.Driver
-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_mj?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_mj?characterEncoding=utf8
+jdbc.user=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

src/main/resource/mapper/ware/StoreMapper.xml

@@ -330,8 +330,7 @@
       out_flag = #{outFlag,jdbcType=VARCHAR},
       lock_flag = #{lockFlag,jdbcType=VARCHAR},
       contract_no = #{contractNo,jdbcType=VARCHAR},
-      remark1 = #{remark1,jdbcType=VARCHAR},
-      fk_compony_id = #{fkComponyId,jdbcType=VARCHAR}
+      remark1 = #{remark1,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 
@@ -554,4 +553,9 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
       and t.plate_no = #{param1,jdbcType=VARCHAR};
 
   </select>
+
+  <update id="updateFkById"  parameterType="com.th.demo.model.ware.Store">
+    update  t_ware_store t set t.fk_compony_id = #{fkComponyId,jdbcType=VARCHAR}
+    where t.id = #{id,jdbcType=VARCHAR}
+  </update>
 </mapper>