From d2b0cd7ae27bb7ea24549d6930a53cbb27c6e44a Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期日, 08 三月 2026 19:55:34 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java | 31 +
src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java | 19
src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java | 47 +
src/main/java/com/zy/asrs/domain/param/SystemSwitchParam.java | 30 +
src/main/java/com/zy/asrs/service/OpenService.java | 8
src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java | 5
src/main/java/com/zy/asrs/domain/vo/LocChartPie.java | 37 +
src/main/java/com/zy/asrs/entity/param/StockOutParam.java | 43 -
src/main/java/com/zy/asrs/domain/param/CrnDemoParam.java | 20
src/main/java/com/zy/asrs/domain/enums/WorkNoType.java | 48 ++
src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java | 28 +
src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java | 53 ++
src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java | 38 +
src/main/java/com/zy/asrs/domain/vo/CommandLogVo.java | 20
src/main/java/com/zy/asrs/controller/OpenController.java | 374 ++++++++++++---
src/main/java/com/zy/asrs/entity/param/QueryCombParam.java | 10
src/main/java/com/zy/asrs/entity/param/QueryTaskParam.java | 10
src/main/java/com/zy/asrs/domain/vo/PlcErrorTableVo.java | 20
src/main/java/com/zy/asrs/domain/vo/SiteLatestDataVo.java | 29 +
src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java | 42 +
src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java | 65 ++
src/main/java/com/zy/asrs/domain/dto/AxisBean.java | 24 +
src/main/java/com/zy/asrs/domain/vo/ScaleDataVo.java | 18
src/main/java/com/zy/asrs/domain/vo/BarcodeDataVo.java | 18
src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java | 90 +++
src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java | 40 +
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 259 +++------
27 files changed, 1,123 insertions(+), 303 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 9fff8ad..7b3e816 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -2,25 +2,25 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.Task;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.domain.dto.AxisBean;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
-import com.zy.asrs.service.OpenService;
-import com.zy.asrs.service.TaskService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.mapper.ReportQueryMapper;
+import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
-import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-
import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.TimeUnit;
/**
* Created by vincent on 2022/4/8
@@ -37,92 +37,175 @@
@Autowired
private OpenService openService;
-
@Autowired
- private TaskService taskService;
+ private WrkMastService wrkMastService;
+ @Autowired
+ private WorkService workService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private ReportQueryMapper reportQueryMapper;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private WaitPakinService waitPakinService;
- @PostMapping("/agvPickupComplete/agvCallback")
- @AppAuth(memo = "AGV鍙栬揣瀹屾垚鎺ュ彛")
- public Map<String, Object> agvPickupComplete(@RequestBody AgvTaskParam agvTaskParam, HttpServletRequest request) {
- // DecimalFormat df = new DecimalFormat("0000");
- // String wrkNo = "Ctu"+df.format(param.getWrkNo())+date.getTime()/1000;
-// String wrkNo = agvTaskParam.getTaskCode().substring(3,7);
-// Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", Integer.parseInt(wrkNo)));
- Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", agvTaskParam.getTaskCode()));
- if (Cools.isEmpty(task)) {
- log.error("鏈煡璇㈠埌浠诲姟鍙峰搴旂殑鏁版嵁");
+ /**
+ * 缁勬墭鏌ヨ鎺ュ彛
+ */
+ @PostMapping("/queryComb")
+ public synchronized R queryComb(@RequestBody QueryCombParam param) {
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
}
- task.setWrkSts(0L);
- taskService.updateById(task);
+ if (Cools.isEmpty(param.getBarcode())) {
+ return R.error("鎵樼洏鐮乕barcode]涓嶈兘涓虹┖");
+ }
+
+ List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
HashMap<String, Object> map = new HashMap<>();
- map.put("code","0");
- map.put("message","鎴愬姛");
- map.put("reqCode", "");
- log.info("agv璇锋眰鍙栬揣瀹屾垚锛寃ms浠诲姟鍙�:"+ JSON.toJSONString(agvTaskParam));
- return map;
-
+ map.put("barcode", param.getBarcode());
+ map.put("combDetls", waitPakins);
+ return R.ok().add(map);
}
- @PostMapping("/agvTaskComplete/agvCallback")
- @AppAuth(memo = "AGV鏀捐揣瀹屾垚鎺ュ彛")
- public Map<String, Object> agvTaskComplete(@RequestBody AgvTaskParam agvTaskParam,HttpServletRequest request) {
- HashMap<String, Object> map = new HashMap<>();
-// String wrkNo = agvTaskParam.getTaskCode().substring(3,7);
-// Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", Integer.parseInt(wrkNo)));
- Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", agvTaskParam.getTaskCode()));
- if (Cools.isEmpty(task)) {
- log.error("鏈煡璇㈠埌浠诲姟鍙峰搴旂殑鏁版嵁");
- }
- if (task.getIoType() < 100 ){
- task.setWrkSts(4L);
- }else {
- task.setWrkSts(14L);
- }
- taskService.updateById(task);
+ /**
+ * 搴撳瓨淇℃伅鏌ヨ鎺ュ彛
+ */
+ @GetMapping("/queryLoc")
+ public synchronized R queryLoc() {
+ List<Map<String, Object>> pie = new ArrayList<>();
+ LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
- map.put("code","0");
- map.put("message","鎴愬姛");
- map.put("reqCode", "");
- return map;
+ if (locUseRate != null) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("name", "鍦ㄥ簱");
+ map.put("value", locUseRate.getFqty());
+ pie.add(map);
+
+ Map<String, Object> map1 = new HashMap<>();
+ map1.put("name", "绌�");
+ map1.put("value", locUseRate.getOqty());
+ pie.add(map1);
+
+ Map<String, Object> map2 = new HashMap<>();
+ map2.put("name", "浣跨敤");
+ map2.put("value", locUseRate.getUqty());
+ pie.add(map2);
+
+ Map<String, Object> map3 = new HashMap<>();
+ map3.put("name", "绂佺敤");
+ map3.put("value", locUseRate.getXqty());
+ pie.add(map3);
+ }
+
+ // 鎬诲簱浣嶆暟
+ Integer total = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty());
+ // 浣跨敤涓�
+ Integer used = locUseRate.getFqty() + locUseRate.getUqty();
+ // 搴撲綅浣跨敤鐜�
+ double usedDivides = Arith.divides(3, used, total);
+ double usedPr = Arith.multiplys(1, usedDivides, 100);
+
+ return R.ok(
+ Cools.add("pie", pie)
+ .add("stockCount", locUseRate.getFqty())
+ .add("emptyCount", locUseRate.getOqty())
+ .add("disableCount", locUseRate.getXqty())
+ .add("total", total)
+ .add("used", used)
+ .add("usedPr", usedPr)
+ );
}
- @PostMapping("/order/matSync/default/v2")
-// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
- public synchronized R syncMatInfoV2(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) MatSyncParam.MatParam param,
- HttpServletRequest request){
+ @PostMapping("/order/adjustment/default/v1")
+ public synchronized R adjustmentOrderCreate(@RequestHeader(required = false) String appkey,
+ @RequestBody OpenAdjustmentOrderParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- MatSyncParam matSyncParam = new MatSyncParam();
- List<MatSyncParam.MatParam> objects = new ArrayList<>();
- objects.add(param);
- matSyncParam.matDetails = objects;
- openService.syncMat(matSyncParam);
+ if (Cools.isEmpty(param.getOrderNo())) {
+ return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderDetails())) {
+ return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ }
+ openService.adjustmentOrderCreate(param);
return R.ok();
}
+ @GetMapping("/line/charts")
+ public R locIoLineCharts(){
+ Map<String,Object> map=new HashMap<String, Object>();
+ List<AxisBean> list = new ArrayList<AxisBean>();
- @PostMapping("/queryTask")
- @ApiOperation("浠诲姟鎵ц淇℃伅鏌ヨ")
- public synchronized R queryTaskInfo(@RequestBody TvQueryParam param) {
- if (Objects.isNull(param)) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ List<WorkChartAxis> listChart = reportQueryMapper.getChartAxis();
+
+ if(listChart!=null) {
+ ArrayList<Integer> data1 = new ArrayList<Integer>();
+ ArrayList<Integer> data2 = new ArrayList<Integer>();
+
+ SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DATE, -12);
+ for(int i=0;i<12;i++) {
+ boolean flag = true;
+ calendar.add(Calendar.DATE, 1);
+ String str = sf.format(calendar.getTime());
+ for(WorkChartAxis workChart : listChart) {
+ if(str.equals(workChart.getYmd())) {
+ data1.add(workChart.getInqty());
+ data2.add(workChart.getOutqty());
+ flag = false;
+ break;
+ }
+ }
+ if(flag) {
+ data1.add(0);
+ data2.add(0);
+ }
+ }
+ AxisBean inqty = new AxisBean();
+ inqty.setName("鍏ュ簱鏁伴噺");
+ Integer[] array1 = new Integer[data1.size()];
+ inqty.setData(data1.toArray(array1));
+ list.add(inqty);
+ AxisBean outqty = new AxisBean();
+ outqty.setName("鍑哄簱鏁伴噺");
+ Integer[] array2 = new Integer[data2.size()];
+ outqty.setData(data2.toArray(array2));
+ list.add(outqty);
}
- return openService.queryTaskInfo(param);
+ map.put("rows",list);
+ return R.ok(map);
+ }
+ @GetMapping("/locDetl/statistics")
+ public R locDetlStatistics(){
+ HashMap<String, Object> param = new HashMap<>();
+ Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(1, 100, param, LocDetl.class));
+ for (LocDetl locDetl : stockStatis.getRecords()) {
+ Mat mat = matService.selectByMatnr(locDetl.getMatnr());
+ if (mat != null) {
+ locDetl.sync(mat);
+ }
+ }
+ return R.ok(stockStatis);
}
@PostMapping("/order/matSync/default/v1")
-// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
+ @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
- HttpServletRequest request){
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -147,24 +230,6 @@
// openService.packageUp(param);
// return R.ok();
// }
-
- @PostMapping("/order/adjustment/default/v1")
- public synchronized R adjustmentOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenAdjustmentOrderParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getOrderNo())) {
- return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrderDetails())) {
- return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
- }
- openService.adjustmentOrderCreate(param);
- return R.ok();
- }
/**
* 娣诲姞鍏ュ簱鍗�
@@ -193,7 +258,7 @@
/**
* 鍏ュ簱鍗曞洖鍐�
*/
-// @PostMapping("/order/pakin/complete/default/v1")
+ @PostMapping("/order/pakin/complete/default/v1")
public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) OpenOrderCompleteParam param,
HttpServletRequest request) {
@@ -213,6 +278,12 @@
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
+ if (Cools.isEmpty(param.getLgort())) {
+ return R.error("鍗曟嵁缂栧彿[lgort]涓嶈兘涓虹┖");
+ }
+ if (!param.getLgort().equals("5006")) {
+ return R.ok();
+ }
if (Cools.isEmpty(param.getOrderNo())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
}
@@ -229,7 +300,7 @@
/**
* 鍑哄簱鍗曞洖鍐�
*/
-// @PostMapping("/order/pakout/complete/default/v1")
+ @PostMapping("/order/pakout/complete/default/v1")
public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) OpenOrderCompleteParam param,
HttpServletRequest request) {
@@ -301,4 +372,137 @@
System.out.println(JSON.toJSONString(param1));
}
+ /*********************************鍚屾鐗╂枡妗ｆ鍜岃鍗�****************************************************/
+
+ /*********************************wcs鎺ュ彛瀵规帴****************************************************/
+
+ /**
+ * 浠诲姟寮�濮�
+ */
+ @RequestMapping("/start/task")
+ public HashMap<String, Object> startTask(@RequestBody HashMap<String, Object> map) {
+ String taskNo = map.get("TaskNo") + "";
+ HashMap<String, Object> map1 = new HashMap<>();
+ if (Cools.isEmpty(taskNo)) {
+ map1.put("ReturnStatus", "1");
+ map1.put("ErrorMessage", "浠诲姟鍙蜂负绌�");
+ } else {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.valueOf(taskNo)));
+ if (wrkMast == null) {
+ map1.put("ReturnStatus", "1");
+ map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo);
+ } else {
+ if (wrkMast.getIoType() == 1||wrkMast.getIoType() == 57|| wrkMast.getIoType() == 53) {
+ wrkMast.setWrkSts(3L);//鍏ュ簱寮�濮�
+ } else if (wrkMast.getIoType() == 11 ||wrkMast.getIoType() == 107|| wrkMast.getIoType() == 103 ) {
+ wrkMast.setWrkSts(13L);//鍑哄簱寮�濮�
+ }
+ wrkMast.setModiTime(new Date());
+ if (wrkMastService.updateById(wrkMast)) {
+ log.info("WMS浠诲姟寮�濮嬫洿鏂�"+wrkMast);
+ map1.put("ReturnStatus", "0");
+ map1.put("ErrorMessage", "");
+ } else {
+ map1.put("ReturnStatus", "1");
+ map1.put("ErrorMessage", "鏇存柊浠诲姟鐘舵�佸け璐�" + wrkMast);
+ }
+ }
+ }
+ return map1;
+ }
+
+ /**
+ * 鎼繍鍒扮洰鐨勫湴
+ */
+ @RequestMapping("/destination/task")
+ public HashMap<String, Object> destinationTask(@RequestBody HashMap<String, Object> map) {
+ String taskNo = map.get("TaskNo") + "";
+ HashMap<String, Object> map1 = new HashMap<>();
+ if (Cools.isEmpty(taskNo)) {
+ map1.put("ReturnStatus", "1");
+ map1.put("ErrorMessage", "浠诲姟鍙蜂负绌�");
+ } else {
+ //浠诲姟瀹屾垚
+ if (map.get("Result").equals(1)) {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.valueOf(taskNo)));
+ if (wrkMast == null) {
+ map1.put("ReturnStatus", "1");
+ map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo);
+ } else {
+ if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10) {
+ wrkMast.setWrkSts(4L);//浠诲姟缁撴潫
+ } else if (wrkMast.getIoType() == 101) {
+ wrkMast.setWrkSts(13L);//鍑哄簱鍒扮珯鐐逛笂
+ } else if (wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57) {
+ wrkMast.setWrkSts(4L);//4.浠诲姟缁撴潫
+ } else if (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 110) {
+ wrkMast.setWrkSts(14L);
+ }else if(wrkMast.getIoType() == 11) {
+ wrkMast.setWrkSts(4L);
+ }
+ wrkMast.setModiTime(new Date());
+ if (wrkMastService.update(wrkMast,new EntityWrapper<WrkMast>().eq("wrk_no",wrkMast.getWrkNo()))) {
+ log.info("WMS浠诲姟瀹屾垚鏇存柊"+wrkMast);
+ map1.put("ReturnStatus", "0");
+ map1.put("ErrorMessage", "");
+ } else {
+ map1.put("ReturnStatus", "1");
+ map1.put("ErrorMessage", "鏇存柊浠诲姟鐘舵�佸け璐�" + wrkMast);
+ }
+ }
+ } else {
+ //浠诲姟鍙栨秷
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.valueOf(taskNo)));
+ if (wrkMast == null) {
+ map1.put("ReturnStatus", "1");
+ map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo);
+ return map1;
+ }
+ workService.cancelWrkMast(String.valueOf(wrkMast.getWrkNo()),9999L);
+ map1.put("ReturnStatus", "0");
+ map1.put("ErrorMessage", "");
+ }
+ }
+ return map1;
+ }
+
+ /**
+ * 鍑哄簱---鐩殑鍦版惉绂�
+ */
+ @RequestMapping("/leave/task")
+ public R leaveTask(@RequestBody HashMap<String, Object> map) {
+ String taskNo = String.valueOf(map.get("taskNo"));
+ String status = String.valueOf(map.get("status"));
+ HashMap<String, Object> map1 = new HashMap<>();
+ if (Cools.isEmpty(taskNo)) {
+ return R.error("浠诲姟鍙蜂负绌�");
+ } else {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.valueOf(taskNo)));
+ if (wrkMast == null) {
+ return R.error("娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo);
+ }
+
+ if (status.equals("complete")) {
+ // 鍏ュ簱 + 搴撲綅杞Щ
+ if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType()==11)) {
+ wrkMast.setWrkSts(4L);
+ // 鍑哄簱
+ } else if (wrkMast.getWrkSts() > 10) {
+ wrkMast.setWrkSts(14L);
+ }
+ Date now = new Date();
+ wrkMast.setWrkSts(14L);//鍑哄簱鍒扮珯鐐逛笂
+ wrkMast.setCrnStrTime(DateUtils.calculate(now, 1L, TimeUnit.SECONDS, true));
+ wrkMast.setCrnEndTime(now);
+ wrkMast.setModiTime(now);
+ wrkMastService.updateById(wrkMast);
+
+ return R.ok();
+ } else if (status.equals("cancel")) {
+ workService.cancelWrkMast(taskNo, 9527L);
+ return R.ok();
+ }
+ }
+ return R.error();
+ }
}
diff --git a/src/main/java/com/zy/asrs/domain/dto/AxisBean.java b/src/main/java/com/zy/asrs/domain/dto/AxisBean.java
new file mode 100644
index 0000000..4b86146
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/dto/AxisBean.java
@@ -0,0 +1,24 @@
+package com.zy.asrs.domain.dto;
+
+/**
+ * 鏇茬嚎鍥捐〃json閿�
+ * @author admin
+ *
+ */
+public class AxisBean {
+ private String name;
+ private Integer[] data;
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+ public Integer[] getData() {
+ return data;
+ }
+ public void setData(Integer[] data) {
+ this.data = data;
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java b/src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java
new file mode 100644
index 0000000..cbb46b7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java
@@ -0,0 +1,31 @@
+package com.zy.asrs.domain.dto;
+
+/**
+ * 鍏ュ嚭搴撶粺璁℃洸绾垮浘
+ * @author admin
+ * @date 2018骞�12鏈�12鏃�
+ */
+public class WorkChartAxis {
+ private String ymd;
+ private int inqty;
+ private int outqty;
+
+ public String getYmd() {
+ return ymd;
+ }
+ public void setYmd(String ymd) {
+ this.ymd = ymd;
+ }
+ public int getInqty() {
+ return inqty;
+ }
+ public void setInqty(int inqty) {
+ this.inqty = inqty;
+ }
+ public int getOutqty() {
+ return outqty;
+ }
+ public void setOutqty(int outqty) {
+ this.outqty = outqty;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java b/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
new file mode 100644
index 0000000..99b6d01
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
@@ -0,0 +1,53 @@
+package com.zy.asrs.domain.enums;
+
+/**
+ * 鍫嗗灈鏈虹姸鎬佹灇涓�
+ */
+public enum CrnStatusType {
+
+ // 鍏ュ簱
+ MACHINE_PAKIN("鍏ュ簱"),
+ // 鍑哄簱
+ MACHINE_PAKOUT("鍑哄簱"),
+ // 搴撳埌搴�
+ MACHINE_STOCK_MOVE("搴撳埌搴�"),
+ // 绔欏埌绔�
+ MACHINE_SITE_MOVE("绔欏埌绔�"),
+ // p to p
+ MACHINE_P_MOVE("PToP"),
+ // 寮傚父
+ MACHINE_ERROR("寮傚父"),
+ // 鑷姩
+ MACHINE_AUTO("鑷姩"),
+ // 闈炶嚜鍔�/鎵嬪姩
+ MACHINE_UN_AUTO("闈炶嚜鍔�"),
+ ;
+
+ private String desc;
+ CrnStatusType(String desc){
+ this.desc = desc;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
+
+ public static CrnStatusType process(Integer ioType){
+ if (ioType>100) {
+ return MACHINE_PAKOUT;
+ } else if (ioType < 100 && ioType!=3 && ioType!=6 && ioType!=11) {
+ return MACHINE_PAKIN;
+ } else if (ioType == 3) {
+ return MACHINE_SITE_MOVE;
+ } else if (ioType == 11) {
+ return MACHINE_STOCK_MOVE;
+ } else {
+ return MACHINE_ERROR;
+ }
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java b/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
new file mode 100644
index 0000000..91fa115
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
@@ -0,0 +1,19 @@
+package com.zy.asrs.domain.enums;
+
+/**
+ * 绔欑偣鐘舵�佹灇涓�
+ */
+public enum SiteStatusType {
+
+ // 鑷姩
+ SITE_AUTO,
+ // 闈炶嚜鍔�
+ SITE_UNAUTO,
+ // 鑷姩+鏈夌墿+ID
+ SITE_AUTO_RUN_ID,
+ // 鑷姩+鏈夌墿
+ SITE_AUTO_RUN,
+ // 鑷姩+ID
+ SITE_AUTO_ID,
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/enums/WorkNoType.java b/src/main/java/com/zy/asrs/domain/enums/WorkNoType.java
new file mode 100644
index 0000000..4aa3911
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/enums/WorkNoType.java
@@ -0,0 +1,48 @@
+package com.zy.asrs.domain.enums;
+
+import com.core.exception.CoolException;
+
+/**
+ * 宸ヤ綔鍙锋帓搴忚鍒�
+ */
+public enum WorkNoType {
+
+ PAKIN(0),
+ PICK(1),
+ PAKOUT(2),
+ OTHER(3),
+ ;
+
+ public Integer type;
+
+ WorkNoType(Integer type) {
+ this.type = type;
+ }
+
+ public static Integer getWorkNoType(Integer ioType) {
+ switch (ioType) {
+ case 1:
+ return PAKIN.type;
+ case 10:
+ return PAKIN.type;
+ case 11:
+ return PICK.type;
+ case 53:
+ case 54:
+ case 57:
+ return PICK.type;
+ case 101:
+ return PAKOUT.type;
+ case 103:
+ case 104:
+ case 107:
+ return PICK.type;
+ case 110:
+ return PAKOUT.type;
+ default:
+ break;
+ }
+ throw new CoolException(ioType + "鐨勪换鍔＄被鍨嬫棤娉曠敓鎴愬伐浣滃彿");
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/param/CrnDemoParam.java b/src/main/java/com/zy/asrs/domain/param/CrnDemoParam.java
new file mode 100644
index 0000000..c724435
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/param/CrnDemoParam.java
@@ -0,0 +1,20 @@
+package com.zy.asrs.domain.param;
+
+import lombok.Data;
+
+/**
+ * 鍫嗗灈鏈烘紨绀烘搷浣滃叆鍙�
+ * Created by vincent on 2020-06-03
+ */
+@Data
+public class CrnDemoParam {
+
+ // 鎿嶄綔绫诲瀷 1: 鎵撳紑; 0: 鍏抽棴
+ private Integer crnId;
+
+ // 瀵嗙爜鍙ｄ护
+ private String password;
+
+ private Boolean opt;
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java b/src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java
new file mode 100644
index 0000000..f85698e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java
@@ -0,0 +1,38 @@
+package com.zy.asrs.domain.param;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020-06-02
+ */
+@Data
+public class CrnOperatorParam {
+
+ // 鍫嗗灈鏈哄彿
+ private Integer crnNo;
+
+ // 婧愮珯
+ private Short sourceStaNo;
+
+ // 婧愬簱浣�-鎺�
+ private Short sourceRow;
+
+ // 婧愬簱浣�-鍒�
+ private Short sourceBay;
+
+ // 婧愬簱浣�-灞�
+ private Short sourceLev;
+
+ // 鐩爣绔�
+ private Short staNo;
+
+ // 鐩爣搴撲綅-鎺�
+ private Short row;
+
+ // 鐩爣搴撲綅-鍒�
+ private Short bay;
+
+ // 鐩爣搴撲綅-灞�
+ private Short lev;
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/param/SystemSwitchParam.java b/src/main/java/com/zy/asrs/domain/param/SystemSwitchParam.java
new file mode 100644
index 0000000..02bec5a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/param/SystemSwitchParam.java
@@ -0,0 +1,30 @@
+package com.zy.asrs.domain.param;
+
+/**
+ * 绯荤粺杩愯鐘舵�佹搷浣滃叆鍙�
+ * Created by vincent on 2020-06-03
+ */
+public class SystemSwitchParam {
+
+ // 鎿嶄綔绫诲瀷 1: 鎵撳紑; 0: 鍏抽棴
+ private Integer operatorType;
+
+ // 瀵嗙爜鍙ｄ护
+ private String password;
+
+ public Integer getOperatorType() {
+ return operatorType;
+ }
+
+ public void setOperatorType(Integer operatorType) {
+ this.operatorType = operatorType;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/BarcodeDataVo.java b/src/main/java/com/zy/asrs/domain/vo/BarcodeDataVo.java
new file mode 100644
index 0000000..acfc261
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/BarcodeDataVo.java
@@ -0,0 +1,18 @@
+package com.zy.asrs.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 鎵爜鍣ㄥ疄鏃舵暟鎹鍥惧璞�
+ * Created by vincent on 2020-06-03
+ */
+@Data
+public class BarcodeDataVo {
+
+ // 鎵爜鍣ㄧ紪鍙�
+ private Integer barcodeId;
+
+ // 鎵爜鍣ㄥ唴瀹�
+ private String codeValue;
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CommandLogVo.java b/src/main/java/com/zy/asrs/domain/vo/CommandLogVo.java
new file mode 100644
index 0000000..37fa9c0
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/CommandLogVo.java
@@ -0,0 +1,20 @@
+package com.zy.asrs.domain.vo;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020-06-02
+ */
+@Data
+public class CommandLogVo {
+
+ // 鍫嗗灈鏈虹紪鍙�
+ private Integer crnNo;
+
+ // 鐘舵��
+ private Integer status;
+
+ // 鍛戒护鎶ユ枃
+ private String command;
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java
new file mode 100644
index 0000000..434cedc
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java
@@ -0,0 +1,42 @@
+package com.zy.asrs.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 鍫嗗灈鏈鸿鎯呰鍥惧璞�
+ * Created by vincent on 2020-06-03
+ */
+@Data
+public class CrnDetailVo {
+
+ // 鍫嗗灈鏈哄彿
+ private Integer crnNo;
+
+ // 宸ヤ綔鍙�
+ private Short workNo;
+
+ // 婧愮珯
+ private String sourceStaNo = "";
+
+ // 鐩爣绔�
+ private String staNo = "";
+
+ // 宸ヤ綔鐘舵��
+ private String wrkSts = "";
+
+ // 鍑哄叆绫诲瀷
+ private String ioType = "";
+
+ // 婧愬簱浣�
+ private String sourceLocNo = "";
+
+ // 鐩爣搴撲綅
+ private String locNo = "";
+
+ // 鍫嗗灈鏈虹姸鎬�
+ private String crnStatus = "";
+
+ // 寮傚父
+ private String error = "";
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
new file mode 100644
index 0000000..3200202
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
@@ -0,0 +1,28 @@
+package com.zy.asrs.domain.vo;
+
+import com.zy.asrs.domain.enums.CrnStatusType;
+import lombok.Data;
+
+/**
+ * 鍫嗗灈鏈烘渶鏂版暟鎹鍥惧璞�
+ * Created by vincent on 2020-06-01
+ */
+@Data
+public class CrnLatestDataVo {
+
+ // 鍫嗗灈鏈虹紪鍙�
+ private Integer crnId;
+
+ // 鍋忕Щ閲�
+ private Double offset;
+
+ // 褰撳墠鍒�
+ private Short bay;
+
+ private CrnStatusType crnStatus;
+
+ public String getCrnStatus(){
+ return crnStatus.toString().toLowerCase().replaceAll("_", "-");
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java
new file mode 100644
index 0000000..ef124a3
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java
@@ -0,0 +1,90 @@
+package com.zy.asrs.domain.vo;
+
+import com.zy.asrs.utils.Utils;
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020-06-02
+ */
+@Data
+public class CrnMsgTableVo {
+
+ // 鍫嗗灈鏈哄彿
+ private Integer crnNo;
+
+ // 宸ヤ綔鍙�
+ private Short workNo = 0;
+
+ // 鐘舵��
+ private String status = "-";
+
+ // 婧愮珯
+ private String sourceStaNo = "-";
+
+ // 鐩爣绔�
+ private String staNo = "-";
+
+ // 婧愬簱浣�
+ private String sourceLocNo = "-";
+
+ // 鐩爣搴撲綅
+ private String locNo = "-";
+
+ // 寮傚父
+ private String error = "";
+
+ // 鍘熺偣
+ private String origin = "";
+
+ // 鍛戒护
+ private String command = "";
+
+ // 璧拌閫熷害锛坢/min)
+ private Float xspeed = 0.0F;
+
+ // 鍗囬檷閫熷害锛坢/min)
+ private Float yspeed = 0.0F;
+
+ // 鍙夌墮閫熷害锛坢/min)
+ private Float zspeed = 0.0F;
+
+ // 璧拌璺濈(Km)
+ private Float xdistance = 0.0F;
+
+ // 鍗囬檷璺濈(Km)
+ private Float ydistance = 0.0F;
+
+ // 璧拌鏃堕暱(H)
+ private Float xduration = 0.0F;
+
+ // 鍗囬檷鏃堕暱(H)
+ private Float yduration = 0.0F;
+
+ public void setXspeed(Float xspeed) {
+ this.xspeed = Utils.scale(xspeed);
+ }
+
+ public void setYspeed(Float yspeed) {
+ this.yspeed = Utils.scale(yspeed);
+ }
+
+ public void setZspeed(Float zspeed) {
+ this.zspeed = Utils.scale(zspeed);
+ }
+
+ public void setXdistance(Float xdistance) {
+ this.xdistance = Utils.scale(xdistance);
+ }
+
+ public void setYdistance(Float ydistance) {
+ this.ydistance = Utils.scale(ydistance);
+ }
+
+ public void setXduration(Float xduration) {
+ this.xduration = Utils.scale(xduration);
+ }
+
+ public void setYduration(Float yduration) {
+ this.yduration = Utils.scale(yduration);
+ }
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
new file mode 100644
index 0000000..4e9f53a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
@@ -0,0 +1,65 @@
+package com.zy.asrs.domain.vo;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020-06-02
+ */
+@Data
+public class CrnStateTableVo {
+
+ // 鍫嗗灈鏈哄彿
+ private Integer crnNo;
+
+ // 妯″紡
+ private String statusType = "-";
+
+ // 鏈夌墿
+ private String loading = "-";
+
+ // 鍒�
+ private Short bay;
+
+ // 灞�
+ private Short lev;
+
+ // 璧拌鍘熺偣
+ private String xOrigin = "-";
+
+ // 鍗囬檷鍘熺偣
+ private String yOrigin = "-";
+
+ // 璐у弶浣嶇疆
+ private String forkOffset = "-";
+
+ // 杞借揣鍙颁綅缃�
+ private String liftPos = "-";
+
+ // 璧拌瀹氫綅
+ private String walkPos = "-";
+
+ // 鎬ュ仠
+ private String stop = "-";
+
+ // 鍒楀潗鏍�
+ private String bayCoor = "-";
+
+ // 灞傚潗鏍�
+ private String levCoor = "-";
+
+ // 瀹屾垚
+ private String complete = "-";
+
+ // 浠诲姟鍙�
+ private Short workNo = 0;
+
+ // 鐘舵��
+ private String status = "-";
+
+ // 寮傚父鐮�
+ private String warnCode = "-";
+
+ // 鍨傜洿鏁呴殰鐮�
+ private String alarm = "-";
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/LocChartPie.java b/src/main/java/com/zy/asrs/domain/vo/LocChartPie.java
new file mode 100644
index 0000000..1492d1b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/LocChartPie.java
@@ -0,0 +1,37 @@
+package com.zy.asrs.domain.vo;
+
+/**
+ * 搴撲綅鍗犵敤鐧惧垎姣�
+ * @author admin
+ * @date 2018骞�12鏈�12鏃�
+ */
+public class LocChartPie {
+ private int fqty;
+ private int oqty;
+ private int uqty;
+ private int xqty;
+ public int getFqty() {
+ return fqty;
+ }
+ public void setFqty(int fqty) {
+ this.fqty = fqty;
+ }
+ public int getOqty() {
+ return oqty;
+ }
+ public void setOqty(int oqty) {
+ this.oqty = oqty;
+ }
+ public int getUqty() {
+ return uqty;
+ }
+ public void setUqty(int uqty) {
+ this.uqty = uqty;
+ }
+ public int getXqty() {
+ return xqty;
+ }
+ public void setXqty(int xqty) {
+ this.xqty = xqty;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/domain/vo/PlcErrorTableVo.java b/src/main/java/com/zy/asrs/domain/vo/PlcErrorTableVo.java
new file mode 100644
index 0000000..38fed7e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/PlcErrorTableVo.java
@@ -0,0 +1,20 @@
+package com.zy.asrs.domain.vo;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020-06-02
+ */
+@Data
+public class PlcErrorTableVo {
+
+ // 搴忓彿
+ private Integer no;
+
+ // plc寮傚父鎻忚堪
+ private String plcDesc;
+
+ // 寮傚父
+ private String error;
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/ScaleDataVo.java b/src/main/java/com/zy/asrs/domain/vo/ScaleDataVo.java
new file mode 100644
index 0000000..1b1aefb
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/ScaleDataVo.java
@@ -0,0 +1,18 @@
+package com.zy.asrs.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 纾呯Г瀹炴椂鏁版嵁瑙嗗浘瀵硅薄
+ * Created by vincent on 2020-06-03
+ */
+@Data
+public class ScaleDataVo {
+
+ // 纾呯Г缂栧彿
+ private Integer scaleId;
+
+ // 纾呯Г鍐呭
+ private String value;
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java
new file mode 100644
index 0000000..7cdcf91
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java
@@ -0,0 +1,47 @@
+package com.zy.asrs.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 杈撻�佽澶囪鎯呰鍥惧璞�
+ * Created by vincent on 2020-06-03
+ */
+@Data
+public class SiteDetailVo {
+
+ // 绔欑偣缂栧彿
+ private Integer siteId;
+
+ // 宸ヤ綔鍙�
+ private Short workNo;
+
+ // 宸ヤ綔鐘舵��
+ private String wrkSts = "";
+
+ // 鑷姩
+ private String autoing;
+
+ // 鏈夌墿
+ private String loading;
+
+ // 鑳藉叆
+ private String canining;
+
+ // 鑳藉嚭
+ private String canouting;
+
+ // 鍑哄叆绫诲瀷
+ private String ioType = "";
+
+ // 婧愮珯
+ private String sourceStaNo = "";
+
+ // 鐩爣绔�
+ private String staNo = "";
+
+ // 婧愬簱浣�
+ private String sourceLocNo = "";
+
+ // 鐩爣搴撲綅
+ private String locNo = "";
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteLatestDataVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteLatestDataVo.java
new file mode 100644
index 0000000..2677861
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteLatestDataVo.java
@@ -0,0 +1,29 @@
+package com.zy.asrs.domain.vo;
+
+import com.zy.asrs.domain.enums.SiteStatusType;
+import lombok.Data;
+
+/**
+ * 绔欑偣鏈�鏂版暟鎹鍥惧璞�
+ * Created by vincent on 2020-06-01
+ */
+@Data
+public class SiteLatestDataVo {
+
+ // 绔欑偣缂栧彿
+ private String siteId;
+
+ // 宸ヤ綔鍙�
+ private Short workNo;
+
+ // 绔欑偣鐘舵��
+ private SiteStatusType siteStatus;
+
+ // 闅斿绔欑偣锛堝彴杞︾壒鎬э級
+ private String nearbySta;
+
+ public String getSiteStatus() {
+ return siteStatus.toString().toLowerCase().replaceAll("_", "-");
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
new file mode 100644
index 0000000..42b7bc9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
@@ -0,0 +1,40 @@
+package com.zy.asrs.domain.vo;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020-06-02
+ */
+@Data
+public class SiteTableVo {
+
+ // 绔欏彿
+ private Integer devNo;
+
+ // 宸ヤ綔鍙�
+ private Short workNo = 0;
+
+ // 鑷姩
+ private String autoing = "-";
+
+ // 鏈夌墿
+ private String loading = "-";
+
+ // 鍙叆
+ private String inEnable = "-";
+
+ // 鍙嚭
+ private String outEnable = "-";
+
+ // 闇�姹�1
+ private String pakMk = "-";
+
+ // 绌烘澘淇″彿
+ private String emptyMk = "-";
+
+ // 鐩爣绔�
+ private Short staNo = 0;
+
+ //楂樹綆搴撲綅
+ private String locType1 = "-";
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/QueryCombParam.java b/src/main/java/com/zy/asrs/entity/param/QueryCombParam.java
new file mode 100644
index 0000000..4dfdfec
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/QueryCombParam.java
@@ -0,0 +1,10 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class QueryCombParam {
+
+ private String barcode;
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/QueryTaskParam.java b/src/main/java/com/zy/asrs/entity/param/QueryTaskParam.java
new file mode 100644
index 0000000..c37e5ae
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/QueryTaskParam.java
@@ -0,0 +1,10 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class QueryTaskParam {
+
+ private String taskNo;
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
index aa3524e..331d3b0 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -1,7 +1,5 @@
package com.zy.asrs.entity.param;
-import com.baomidou.mybatisplus.annotations.TableField;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -32,47 +30,6 @@
// 鏁伴噺
private Double count;
-
- private String brand;
-
- /**
- * 澶囩敤1
- */
- @ApiModelProperty(value= "澶囩敤1")
- private String standby1 = "";
-
- /**
- * 澶囩敤2
- */
- @ApiModelProperty(value= "澶囩敤2")
- private String standby2 = "";
-
- /**
- * 澶囩敤3
- */
- @ApiModelProperty(value= "澶囩敤3")
- private String standby3 = "";
-
- /**
- * 澶囩敤1
- */
- @ApiModelProperty(value= "澶囩敤1")
- @TableField("box_type1")
- private String boxType1 = "1";
-
- /**
- * 澶囩敤2
- */
- @ApiModelProperty(value= "澶囩敤2")
- @TableField("box_type2")
- private String boxType2 = "1";
-
- /**
- * 澶囩敤3
- */
- @ApiModelProperty(value= "澶囩敤3")
- @TableField("box_type3")
- private String boxType3 = "1";
}
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index 6a804db..fc381dd 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -23,7 +23,10 @@
//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
public List<ViewStayTimeBean> getViewStayTimeAll(ViewStayTimeBean viewStayTime);
-// // 搴撲綅Map
+//// // 搴撲綅Map
+// @Select("select distinct row1 from asr_loc_mast order by row1 asc")
+// List<Integer> getViewLocRowTotal();
+ // // 搴撲綅Map
@Select("select distinct row1 from asr_loc_mast order by row1 asc")
List<Integer> getViewLocRowTotal();
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 4709f20..bf4767c 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -1,6 +1,5 @@
package com.zy.asrs.service;
-import com.core.common.R;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
@@ -46,11 +45,4 @@
void syncMat(MatSyncParam param);
void adjustmentOrderCreate(OpenAdjustmentOrderParam param);
-
- /**
- * 鏌ヨ鎵ц浠诲姟淇℃伅
- * @param param
- * @return
- */
- R queryTaskInfo(TvQueryParam param);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index b779694..36e9da3 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
-import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -15,7 +14,6 @@
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
-import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.DetlDto;
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
@@ -23,8 +21,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* Created by vincent on 2022/4/9
@@ -53,12 +52,8 @@
private TagMapper tagMapper;
@Autowired
private CheckOrderDetlService checkOrderDetlService;
- @Autowired
- private CheckOrderService checkOrderService;
- @Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private WrkDetlService wrkDetlService;
+
+
@Override
@Transactional
@@ -104,8 +99,7 @@
now, // 娣诲姞鏃堕棿
9527L, // 淇敼浜哄憳
now, // 淇敼鏃堕棿
- null, // 澶囨敞
- 1
+ null // 澶囨敞
);
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
@@ -114,9 +108,9 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(),detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme(), detail.getThreeCode());
- if (DetlDto.hasLineNumber(list, dto)) {
- DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getLineNumber(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+ if (DetlDto.has(list, dto)) {
+ DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
} else {
@@ -130,13 +124,8 @@
}
OrderDetl orderDetl = new OrderDetl();
orderDetl.sync(mat);
- orderDetl.setLineNumber(detlDto.getLineNumber());
orderDetl.setBatch(detlDto.getBatch());
orderDetl.setAnfme(detlDto.getAnfme());
- orderDetl.setBrand(detlDto.getBrand());
- orderDetl.setStandby1(detlDto.getStandby1());
- orderDetl.setStandby2(detlDto.getStandby2());
- orderDetl.setStandby3(detlDto.getStandby3());
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setCreateBy(9527L);
@@ -145,7 +134,6 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
- orderDetl.setPakinPakoutStatus(1);
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -159,9 +147,6 @@
if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
// 鎸囧畾璁㈠崟
Order order = orderService.selectByNo(param.getOrderNo());
-
-// Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE,param.getOrderNo());
-
if (null != order) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
@@ -169,27 +154,19 @@
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty(), orderDetl.getThreeCode()));
+ result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
}
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-// if (!orderService.updateSettle(order.getId(), 6L, null)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(), 6L, null);
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
}
}
} else {
// 鎵�鏈夎鍗�
-// List<Order> orders = orderService.selectBySettle(4L);
- List<Order> orders = OrderInAndOutUtil.selectBySettle(null, 4L);
- if (orders.isEmpty()){
- orders = new ArrayList<>();
- }
+ List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
for (Order order : orders) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
@@ -197,20 +174,13 @@
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
-
for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(),
- orderDetl.getQty(), orderDetl.getThreeCode()));
+ result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
}
-// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-// if (!orderService.updateSettle(order.getId(), 6L, null)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
-
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
}
}
return results;
@@ -264,8 +234,7 @@
now, // 娣诲姞鏃堕棿
9527L, // 淇敼浜哄憳
now, // 淇敼鏃堕棿
- null, // 澶囨敞
- 2
+ null // 澶囨敞
);
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
@@ -274,11 +243,9 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(),
- detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme(), detail.getThreeCode());
- if (DetlDto.hasLineNumber(list, dto)) {
- DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getLineNumber(),
- dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+ if (DetlDto.has(list, dto)) {
+ DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
} else {
@@ -292,13 +259,8 @@
}
OrderDetl orderDetl = new OrderDetl();
orderDetl.sync(mat);
- orderDetl.setLineNumber(detlDto.getLineNumber());
orderDetl.setBatch(detlDto.getBatch());
orderDetl.setAnfme(detlDto.getAnfme());
- orderDetl.setBrand(detlDto.getBrand());
- orderDetl.setStandby1(detlDto.getStandby1());
- orderDetl.setStandby2(detlDto.getStandby2());
- orderDetl.setStandby3(detlDto.getStandby3());
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setCreateBy(9527L);
@@ -307,7 +269,6 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
- orderDetl.setPakinPakoutStatus(2);
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -320,7 +281,6 @@
if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
// 鎸囧畾璁㈠崟
Order order = orderService.selectByNo(param.getOrderNo());
-// Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, param.getOrderNo());
if (null != order) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
@@ -328,24 +288,19 @@
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(),order.getId());
for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty(), orderDetl.getThreeCode()));
+ result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
}
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-// if (!orderService.updateSettle(order.getId(), 6L, null)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
}
}
} else {
// 鎵�鏈夎鍗�
-// List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
- List<Order> orders = OrderInAndOutUtil.selectBySettle(null, 4L);
+ List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
for (Order order : orders) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
@@ -353,17 +308,13 @@
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty(), orderDetl.getThreeCode()));
+ result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-// if (!orderService.updateSettle(order.getId(), 6L, null)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
}
}
return results;
@@ -475,7 +426,6 @@
tagId = tagService.getTop().getId();
}
mat.setTagId(tagId);
- mat.setLocType(tagId);
mat.setMatnr(analyse.getMatnr());
mat.setMaktx(param.getMaterialName());
mat.setSpecs(param.getConfigureDesc());
@@ -487,6 +437,65 @@
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
} else {
log.info("鎵撳寘涓婄嚎娣诲姞鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
+ }
+ }
+ }
+
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void adjustmentOrderCreate(OpenAdjustmentOrderParam param) {
+ if(Cools.isEmpty(param.getOrderNo())){
+ String prefix = "";
+ DocType docType = docTypeService.selectById(param.getOrderNo());
+ if(!Cools.isEmpty(docType)){
+ prefix = "Adjust";
+ }
+ param.setOrderNo(prefix + snowflakeIdWorker.nextId());
+ }
+ CheckOrder checkOrder = checkOrderService.selectOne(new EntityWrapper<CheckOrder>().eq("order_no", param.getOrderNo()) );
+ if (checkOrder != null) {
+ throw new CoolException("鍗曟嵁宸插瓨鍦�");
+ }
+ Date now = new Date();
+ checkOrder = new CheckOrder();
+ checkOrder.setOrderNo(param.getOrderNo());
+ checkOrder.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
+ checkOrder.setOrderTime( DateUtils.convert(now));
+ checkOrder.setDocType(Long.valueOf(OrderTypeEnum.ADJUSTMENT.type));
+ checkOrder.setSettle(1L);
+ checkOrder.setCreateBy(9527L);
+ checkOrder.setCreateTime(now);
+ checkOrder.setUpdateBy(9527L);
+ checkOrder.setUpdateTime(now);
+ checkOrder.setStatus(1);
+
+ if (!checkOrderService.insert(checkOrder)) {
+ throw new CoolException("淇濆瓨璋冩暣鍗曚富鍗曞け璐�");
+ }
+ for (CheckOrderDetl checkOrderDetl1 : param.getOrderDetails()) {
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+ .eq("matnr", checkOrderDetl1.getMatnr())
+ .eq("loc_no", checkOrderDetl1.getLocNo())
+ .eq("batch", checkOrderDetl1.getBatch())
+ );
+ if (Cools.isEmpty(locDetl)) {
+ throw new CoolException("鏈壘鍒板簱瀛樻槑缁�,璇锋鏌ュ簱瀛�");
+ }
+ CheckOrderDetl checkOrderDetl = new CheckOrderDetl();
+ checkOrderDetl.sync(locDetl);
+ checkOrderDetl.setLocDetlId(locDetl.getId());
+ checkOrderDetl.setOrderId(checkOrder.getId());
+ checkOrderDetl.setOrderNo(checkOrder.getOrderNo());
+ checkOrderDetl.setAnfme(checkOrderDetl1.getAnfme());
+ checkOrderDetl.setDiffQty(checkOrderDetl1.getDiffQty());
+ checkOrderDetl.setWorkQty(checkOrderDetl1.getWorkQty());
+ checkOrderDetl.setStatus(checkOrderDetl1.getStatus().equals(1)? CheckStatusEnum.ALLOW.type:CheckStatusEnum.FORBID.type);
+ checkOrderDetl.setZpallet(locDetl.getZpallet());
+ checkOrderDetl.setCreateTime(now);
+ checkOrderDetl.setUpdateTime(now);
+ if (!checkOrderDetlService.insert(checkOrderDetl)) {
+ throw new CoolException("淇濆瓨璋冩暣鍗曟槑缁嗗け璐�");
}
}
}
@@ -575,14 +584,13 @@
} else {
tagId = tagService.getTop().getId();
}
- mat.sync(matParam);
+ mat.sync(param);
// mat.setMatnr(param.getMatnr());
// mat.setMaktx(param.getMaktx());
// mat.setSpecs(param.getSpecs());
// mat.setModel(param.getModel());
mat.setTagId(tagId);
- mat.setLocType(tagId);
mat.setStatus(1);
mat.setCreateTime(now);
mat.setUpdateTime(now);
@@ -592,94 +600,13 @@
log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
}
} else {
- mat.sync(matParam);
+ mat.sync(param);
if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
}
}
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void adjustmentOrderCreate(OpenAdjustmentOrderParam param) {
- if(Cools.isEmpty(param.getOrderNo())){
- String prefix = "";
- DocType docType = docTypeService.selectById(param.getOrderNo());
- if(!Cools.isEmpty(docType)){
- prefix = "Adjust";
- }
- param.setOrderNo(prefix + snowflakeIdWorker.nextId());
- }
- CheckOrder checkOrder = checkOrderService.selectOne(new EntityWrapper<CheckOrder>().eq("order_no", param.getOrderNo()) );
- if (checkOrder != null) {
- throw new CoolException("鍗曟嵁宸插瓨鍦�");
- }
- Date now = new Date();
- checkOrder = new CheckOrder();
- checkOrder.setOrderNo(param.getOrderNo());
- checkOrder.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
- checkOrder.setOrderTime( DateUtils.convert(now));
- checkOrder.setDocType(Long.valueOf(OrderTypeEnum.ADJUSTMENT.type));
- checkOrder.setSettle(1L);
- checkOrder.setCreateBy(9527L);
- checkOrder.setCreateTime(now);
- checkOrder.setUpdateBy(9527L);
- checkOrder.setUpdateTime(now);
- checkOrder.setStatus(1);
-
- if (!checkOrderService.insert(checkOrder)) {
- throw new CoolException("淇濆瓨璋冩暣鍗曚富鍗曞け璐�");
- }
- for (CheckOrderDetl checkOrderDetl1 : param.getOrderDetails()) {
- LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
- .eq("matnr", checkOrderDetl1.getMatnr())
- .eq("loc_no", checkOrderDetl1.getLocNo())
- .eq("batch", checkOrderDetl1.getBatch())
- );
- if (Cools.isEmpty(locDetl)) {
- throw new CoolException("鏈壘鍒板簱瀛樻槑缁�,璇锋鏌ュ簱瀛�");
- }
- CheckOrderDetl checkOrderDetl = new CheckOrderDetl();
- checkOrderDetl.sync(locDetl);
- checkOrderDetl.setLocDetlId(locDetl.getId());
- checkOrderDetl.setOrderId(checkOrder.getId());
- checkOrderDetl.setOrderNo(checkOrder.getOrderNo());
- checkOrderDetl.setAnfme(checkOrderDetl1.getAnfme());
- checkOrderDetl.setDiffQty(checkOrderDetl1.getDiffQty());
- checkOrderDetl.setWorkQty(checkOrderDetl1.getWorkQty());
- checkOrderDetl.setStatus(checkOrderDetl1.getStatus().equals(1)?CheckStatusEnum.ALLOW.type:CheckStatusEnum.FORBID.type);
- checkOrderDetl.setZpallet(locDetl.getZpallet());
- checkOrderDetl.setCreateTime(now);
- checkOrderDetl.setUpdateTime(now);
- if (!checkOrderDetlService.insert(checkOrderDetl)) {
- throw new CoolException("淇濆瓨璋冩暣鍗曟槑缁嗗け璐�");
- }
- }
- }
-
- /**
- * 鏌ヨ浠诲姟妗ｄ俊鎭�
- * @param param
- * @return
- */
- @Override
- public R queryTaskInfo(TvQueryParam param) {
- if (param.getTaskNo().equals("agv")) {
- return R.ok();
- } else {
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getTaskNo()));
- if (Objects.isNull(wrkMast)) {
- throw new CoolException("浠诲姟淇℃伅涓嶅瓨鍦紒锛�");
- }
- List<WrkDetl> detls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
-
-
- Map<String, Object> wrkast = new HashMap<>();
- wrkast.put("wrkDetls", detls);
- return R.ok().add(wrkast);
- }
}
}
--
Gitblit v1.9.1