张庆宇 3 mesi fa
parent
commit
64c2e44384

+ 19
- 0
src/main/java/com/th/demo/controller/ware/StoreController.java Vedi File

185
         }
185
         }
186
     }
186
     }
187
 
187
 
188
+    @RequestMapping(value = "/changeStack.do")
189
+    public String changeStack(String json,String newWare,String newStack,
190
+                              String newRemark1,
191
+                              String newRemark,
192
+                              HttpServletRequest request) {
193
+
194
+        try {
195
+            String userId = (String) request.getAttribute("userId");
196
+            String belongId = (String) request.getAttribute("belongId");
197
+            result=storeService.changeStack(json,newWare,newStack,newRemark1,newRemark,userId,belongId);
198
+
199
+        } catch (Exception ex) {
200
+            ex.printStackTrace();
201
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
202
+        } finally {
203
+            return result;
204
+        }
205
+    }
206
+
188
 }
207
 }

+ 75
- 4
src/main/java/com/th/demo/service/impl/ware/StoreServiceImpl.java Vedi File

5
 import com.github.pagehelper.PageHelper;
5
 import com.github.pagehelper.PageHelper;
6
 import com.github.pagehelper.PageInfo;
6
 import com.github.pagehelper.PageInfo;
7
 import com.th.demo.mapping.maint.CustomerMapper;
7
 import com.th.demo.mapping.maint.CustomerMapper;
8
+import com.th.demo.mapping.maint.StackMapper;
8
 import com.th.demo.mapping.ware.ChangeRecordMapper;
9
 import com.th.demo.mapping.ware.ChangeRecordMapper;
9
 import com.th.demo.mapping.ware.InRecordMapper;
10
 import com.th.demo.mapping.ware.InRecordMapper;
11
+import com.th.demo.mapping.ware.MoveRecordMapper;
10
 import com.th.demo.mapping.ware.StoreMapper;
12
 import com.th.demo.mapping.ware.StoreMapper;
11
 import com.th.demo.model.maint.Customer;
13
 import com.th.demo.model.maint.Customer;
12
 import com.th.demo.model.maint.Stack;
14
 import com.th.demo.model.maint.Stack;
15
+import com.th.demo.model.system.SysUser;
13
 import com.th.demo.model.system.Type;
16
 import com.th.demo.model.system.Type;
14
-import com.th.demo.model.ware.ChangeRecord;
15
-import com.th.demo.model.ware.InRecord;
16
-import com.th.demo.model.ware.SplitRecord;
17
-import com.th.demo.model.ware.Store;
17
+import com.th.demo.model.ware.*;
18
 import com.th.demo.service.maint.CustomerService;
18
 import com.th.demo.service.maint.CustomerService;
19
 import com.th.demo.service.ware.StoreService;
19
 import com.th.demo.service.ware.StoreService;
20
 import com.th.demo.tools.JSONTools;
20
 import com.th.demo.tools.JSONTools;
39
     public CustomerMapper customerMapper;
39
     public CustomerMapper customerMapper;
40
     @Autowired//自动注入Mapper
40
     @Autowired//自动注入Mapper
41
     public InRecordMapper inRecordMapper;
41
     public InRecordMapper inRecordMapper;
42
+    @Autowired//自动注入Mapper
43
+    public MoveRecordMapper moveRecordMapper;
44
+    @Autowired//自动注入Mapper
45
+    public StackMapper stackMapper;
42
     String result = Type.FAIL;
46
     String result = Type.FAIL;
43
     int num = 0;
47
     int num = 0;
44
 
48
 
338
         }
342
         }
339
         return Tools.moreThanZeroResultJSON(num);
343
         return Tools.moreThanZeroResultJSON(num);
340
     }
344
     }
345
+
346
+    @Override
347
+    public String changeStack(String json, String newWare, String newStack, String newRemark1, String newRemark, String userId, String belongId) {
348
+        List<Store> listStore = JSON.parseObject(json, new TypeReference<List<Store>>() {});
349
+
350
+        int layerNew = 0;
351
+        int layerOld = 0;
352
+        int layer = 0;
353
+        if (!newWare.equals("") && newWare!=null && !newStack.equals("") && newStack!=null){
354
+            Stack toStack = stackMapper.selectByWareNameStackName(newWare,newStack,userId,belongId);
355
+            int currentLayer = Integer.parseInt(storeMapper.selectLayerByStackId(toStack.getId(), belongId));
356
+            if (toStack==null){
357
+                return JSONTools.toString(1,"没有找到该垛位信息");
358
+            }else{
359
+                for (int i = 0; i < listStore.size(); i++) {
360
+                    layerOld = listStore.get(i).getLayer();
361
+
362
+                    if (toStack.getIsLayer().equals("0")) {
363
+                        layerNew = 0;
364
+                    } else if (toStack.getIsLayer().equals("1")) {
365
+                        layerNew = currentLayer + 1 + i;
366
+                    } else if (toStack.getIsLayer().equals("2")) {
367
+                        layerNew = layer;
368
+                    }
369
+
370
+                    MoveRecord moveRecord = getMoveRecord(listStore.get(i), listStore.get(i).getStack(), toStack, layerNew, layerOld, userId);
371
+
372
+                    listStore.get(i).setWare(toStack.getWare());
373
+                    listStore.get(i).setStack(toStack);
374
+                    listStore.get(i).setLayer(layerNew);
375
+                    num = moveRecordMapper.insert(moveRecord);
376
+
377
+                    num += storeMapper.updateByPrimaryKey(listStore.get(i));
378
+                }
379
+            }
380
+        }
381
+        return result;
382
+    }
383
+
384
+    private MoveRecord getMoveRecord(Store store, Stack fromStack, Stack toStack, int layerNew, int layerOld, String userId) {
385
+        MoveRecord moveRecord = new MoveRecord();
386
+        moveRecord.setWareNameOld(fromStack.getWare().getName());
387
+        moveRecord.setWareNameNew(toStack.getWare().getName());
388
+        moveRecord.setStackNameOld(fromStack.getName());
389
+        moveRecord.setStackNameNew(toStack.getName());
390
+        moveRecord.setLayerOld(layerOld);
391
+        moveRecord.setLayerNew(layerNew);
392
+        moveRecord.setMaterialName(store.getMaterial().getName());
393
+        // moveRecord.setMaterialNo(store.getMaterialNo());
394
+        moveRecord.setStandard(store.getMaterial().getStandard());
395
+        moveRecord.setModel(store.getModel());
396
+        moveRecord.setCustomerName(store.getCustomer().getName());
397
+        // moveRecord.setCustomerNo(store.getCustomerNo());
398
+        moveRecord.setCount(store.getCount());
399
+        moveRecord.setWeight(store.getWeight());
400
+        moveRecord.setRemark(store.getRemark());
401
+        moveRecord.setBelongId(store.getBelongId());
402
+        moveRecord.setPlateNo(store.getPlateNo());
403
+        moveRecord.setAddUser(new SysUser(userId));
404
+        moveRecord.setAddTime(new Date());
405
+        moveRecord.setReceiveAddress(store.getReceiveAddress());
406
+        moveRecord.setWgtDcnMtcCd(store.getWgtDcnMtcCd());
407
+        moveRecord.setEdgeTy(store.getEdgeTy());
408
+        moveRecord.setProductionPlace(store.getProductionPlace());
409
+        moveRecord.setCancelFlag("0");
410
+        return moveRecord;
411
+    }
341
 }
412
 }

+ 2
- 0
src/main/java/com/th/demo/service/ware/StoreService.java Vedi File

30
                      String userId,
30
                      String userId,
31
                      String belongId);
31
                      String belongId);
32
 
32
 
33
+    String changeStack(String json,String newWare,String newStack,String newRemark1,
34
+                       String newRemark, String userId,String belongId);
33
 }
35
 }

+ 6
- 6
src/main/resource/localhost/db.properties Vedi File

1
-#jdbc.driverClass=com.mysql.jdbc.Driver
2
-#jdbc.jdbcUrl=jdbc:mysql://172.18.200.32:3306/ware_zg?characterEncoding=utf8
3
-#jdbc.user=root
4
-#jdbc.password=root
5
-
6
 jdbc.driverClass=com.mysql.jdbc.Driver
1
 jdbc.driverClass=com.mysql.jdbc.Driver
7
-jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_zg?characterEncoding=utf8
2
+jdbc.jdbcUrl=jdbc:mysql://172.18.200.32:3306/ware_zg?characterEncoding=utf8
8
 jdbc.user=root
3
 jdbc.user=root
9
 jdbc.password=root
4
 jdbc.password=root
10
 
5
 
6
+#jdbc.driverClass=com.mysql.jdbc.Driver
7
+#jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_zg?characterEncoding=utf8
8
+#jdbc.user=root
9
+#jdbc.password=root
10
+
11
 #jdbc.driverClass=com.mysql.jdbc.Driver
11
 #jdbc.driverClass=com.mysql.jdbc.Driver
12
 #jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/ware_zg?useUnicode=true&characterEncoding=utf8
12
 #jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/ware_zg?useUnicode=true&characterEncoding=utf8
13
 #jdbc.user=root
13
 #jdbc.user=root

Loading…
Annulla
Salva