From 87e99cdcfa55ee1a3b19a19506b05e4f554a416e Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 07 五月 2026 19:34:12 +0800
Subject: [PATCH] 修复订单明细中没有batchSeq
---
src/main/java/com/zy/asrs/controller/OpenController.java | 414 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 229 insertions(+), 185 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 6f6cf15..3031070 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -25,7 +25,6 @@
import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.*;
-import java.util.concurrent.TimeUnit;
/**
* Created by vincent on 2022/4/8
@@ -38,6 +37,7 @@
private static final boolean auth = true;
private static final String sign_arm_order = "|s|LABEL_";
private static final String sign_arm_sku = "|sku|LABEL_";
+ private static final long MILLIS_PER_MINUTE = 60L * 1000L;
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
}};
@@ -50,8 +50,6 @@
private WaitPakinService waitPakinService;
@Autowired
private WrkDetlService wrkDetlService;
- @Autowired
- private WrkDetlLogService wrkDetlLogService;
@Autowired
private WrkMastService wrkMastService;
@Autowired
@@ -232,8 +230,8 @@
@PostMapping("/arm/task/v1")
@AppAuth(memo = "鍒嗘嫞绾夸笂鎶ユ帴鏀�")
public synchronized R TaskArmReport(@RequestHeader(required = false) String appkey,
- @RequestBody TaskArmReportParam param,
- HttpServletRequest request) {
+ @RequestBody TaskArmReportParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -277,8 +275,8 @@
@PostMapping("/arm/task/cycle_result")
@AppAuth(memo = "鍗曠爜瀹屾垚")
public synchronized R TaskArmCycleResult(@RequestHeader(required = false) String appkey,
- @RequestBody TaskArmCycleResultParam param,
- HttpServletRequest request) {
+ @RequestBody TaskArmCycleResultParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -309,8 +307,8 @@
@PostMapping("/arm/task/workspace_status")
@AppAuth(memo = "鎵樼洏瀹屾垚")
public synchronized R TaskArmWorkspaceStatus(@RequestHeader(required = false) String appkey,
- @RequestBody TaskArmWorkspaceStatusParam param,
- HttpServletRequest request) {
+ @RequestBody TaskArmWorkspaceStatusParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -342,8 +340,8 @@
@PostMapping("/arm/task/loc_status")
// @AppAuth(memo = "鎵樼洏灏辩华鐘舵�佹煡璇�")
public synchronized R TaskArmLocStatus(@RequestHeader(required = false) String appkey,
- @RequestBody ArmOKParam param,
- HttpServletRequest request) {
+ @RequestBody ArmOKParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -369,8 +367,8 @@
@PostMapping("/armAbnormalOperation")
// @AppAuth(memo = "寮傚父涓婃姤")
public synchronized R ArmAbnormalOperation(@RequestHeader(required = false) String appkey,
- @RequestBody TaskArmErrorParam param,
- HttpServletRequest request) {
+ @RequestBody TaskArmErrorParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param.getArm_no())) {
return R.error("鏈烘鑷傜紪鍙穂Arm_no]涓嶈兘涓虹┖");
@@ -467,6 +465,26 @@
log.info("[comb] cache: {}", param == null ? "null" : JSON.toJSONString(param));
request.setAttribute("cache", param);
}
+
+ if (Cools.isEmpty(param)) {
+ return R.error("娌℃湁鍏ュ簱鏁版嵁");
+ }
+ boolean boo =false;
+ for (MesToCombParam mesToCombParam : param) {
+ if (mesToCombParam.getOperateType()==2){
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", mesToCombParam.getPalletId()));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", mesToCombParam.getPalletId()));
+ int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",mesToCombParam.getPalletId()).eq("io_status", "Y"));
+ if (countLoc > 0 || countWrk > 0 || countwait > 0) {
+ return R.error(mesToCombParam.getPalletId()+"-宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�,鏃犳硶鍒犻櫎");
+ }
+ waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet",mesToCombParam.getPalletId()));
+ boo = true;
+ }
+ }
+ if (boo){
+ return R.ok();
+ }
List<MesToCombParam> errorComb = Lists.newArrayList();
List<MesToCombParam> validComb = Lists.newArrayList();
for (MesToCombParam mesToCombParam : param) {
@@ -506,7 +524,20 @@
}
/**
- * 7.11 鍑哄簱閫氱煡鍗曪紙浼犻�掓湁搴忔棤搴忚鍒欙級
+ * 7.11 鍑哄簱閫氱煡鍗曪紙浼犻�掓湁搴忔棤搴忚鍒欙級銆�
+ *
+ * ERP 鍑哄簱閫氱煡缁熶竴鍏堣惤鍑哄簱璁㈠崟锛屼笉鍐嶇敱鎺ュ彛绾跨▼鐩存帴鍒涘缓 WrkMast/WrkDetl銆�
+ *
+ * 鍏抽敭瑙勫垯锛�
+ * 1. orderId 浣滀负鍑哄簱璁㈠崟鍙疯惤鍒� man_order_pakout.order_no銆�
+ * 2. stationId > 600 鏃跺繀椤讳紶 entryWmsCode锛屽悗缁寜 entryWmsCode 浣滀负杩涗粨缂栧彿鍒嗘壒鐢熸垚浠诲姟銆�
+ * 3. stationId <= 600 鏃跺厑璁� entryWmsCode 涓虹┖锛屽悗缁敓鎴愪换鍔℃椂浣跨敤 orderId 浣滀负鎵规閿��
+ * 4. 寤哄崟闃舵鍙牎楠屽簱瀛樺拰婊″簱浣嶏紝涓嶉攣搴撲綅銆佷笉鏀� loc_sts锛岀湡姝ｅ崰搴撲粛鐢卞畾鏃剁敓鎴愪换鍔℃椂澶勭悊銆�
+ *
+ * 涓轰粈涔堣繖閲屼笉鍐嶇洿鎺ヨ皟鐢� outOrderBatch锛�
+ * - 鐩存帴寤� WrkMast 浼氶┈涓婃妸搴撲綅浠� F 鏀逛负 R锛孍RP 閲嶅彂銆佷汉宸ヤ腑姝€�乄CS 鍙栨秷鍚庣殑琛ュ伩閮藉緢闅剧粺涓�銆�
+ * - 鍏堣惤璁㈠崟鏄庣粏鍚庯紝鏈敓鎴愪换鍔＄殑鏄庣粏鍙互鍒犻櫎閲嶄笅鍙戯紱宸茬敓鎴愪换鍔＄殑鏄庣粏鐢卞彇娑堥�昏緫鍥炴粴 work_qty銆�
+ * - 浣庣珯鐐瑰拰楂樼珯鐐硅蛋鍚屼竴鏉¤鍗曢摼璺悗锛宲akoutOrderPause/execute 鎵嶈兘鍚屾椂鎺у埗鈥滄湭鐢熸垚鈥濆拰鈥滃凡鐢熸垚鈥濈殑浠诲姟銆�
*/
@PostMapping("/outOrder")
public synchronized R outOrder(@RequestBody ArrayList<OutTaskParam> params, HttpServletRequest request) {
@@ -515,25 +546,57 @@
}
log.info("[outOrder] cache: {}", JSON.toJSONString(params));
request.setAttribute("cache", params);
- Map<String, List<OutTaskParam>> linesByBatch = new LinkedHashMap<>();
+
+ // 缁熶竴鍋氭湁搴�/鏃犲簭鏍￠獙鐨勫垎缁勩��
+ //
+ // 娉ㄦ剰锛氳繖閲岀殑鍒嗙粍 key 涓嶆槸 ERP 鍘熷 batchSeq锛岃�屾槸鈥滄湭鏉ョ敓鎴� WrkMast.batchSeq 鐨勫�尖�濄��
+ // 杩欐牱鍙互鍦ㄦ帴鍙ｅ叆鍙ｅ氨鏍￠獙鏈�缁堜换鍔℃壒娆￠噷鐨� seq 鏄惁杩炵画锛岄伩鍏嶈鍗曞凡缁忚惤搴撳悗瀹氭椂鍣ㄦ墠澶辫触銆�
+ //
+ // 鎵规閿鍒欙細
+ // - 楂樼珯鐐规寜 orderId + entryWmsCode锛�
+ // - 浣庣珯鐐规寜 orderId + orderId銆�
+ Map<String, List<OutTaskParam>> linesByValidateKey = new LinkedHashMap<>();
for (OutTaskParam outTaskParam : params) {
if (Cools.isEmpty(outTaskParam) || Cools.isEmpty(outTaskParam.getOrderId())) {
return R.error("鍑哄簱鍗曞彿涓嶈兘涓虹┖");
}
if (Cools.isEmpty(outTaskParam.getBatchSeq())) {
+ // batchSeq 浠嶄繚瀛� ERP 瀛楁锛涙湭浼犳椂鐢� orderId 琛ラ綈锛屼究浜庢槑缁嗚拷婧��
+ // 浣庣珯鐐圭湡姝ｇ敓鎴愪换鍔℃椂涓嶄娇鐢ㄨ瀛楁浣滀负鎵规閿紝鑰屾槸鍥哄畾浣跨敤 orderId銆�
outTaskParam.setBatchSeq(outTaskParam.getOrderId());
}
if (Cools.isEmpty(outTaskParam.getStationId())) {
return R.error("鎵樼洏銆�" + outTaskParam.getPalletId() + "銆嶅嚭搴撳彛缂栫爜涓嶈兘涓虹┖");
}
- linesByBatch.computeIfAbsent(outTaskParam.getBatchSeq(), k -> new ArrayList<>()).add(outTaskParam);
+ Integer stationId;
+ try {
+ stationId = Integer.valueOf(outTaskParam.getStationId());
+ } catch (NumberFormatException ex) {
+ return R.error("鎵樼洏銆�" + outTaskParam.getPalletId() + "銆嶅嚭搴撳彛缂栫爜鏍煎紡閿欒锛�" + outTaskParam.getStationId());
+ }
+ if (stationId > 600) {
+ // 楂樼珯鐐逛换鍔″繀椤诲甫杩涗粨缂栧彿锛涜繖鏄畾鏃剁敓鎴愪换鍔℃椂鐨勬壒娆¤竟鐣岋紝
+ // 涔熸槸 OutboundBatchSeqReleaseGuard 鍒ゆ柇鑳藉惁鏀捐涓嬩竴杩涗粨缂栧彿鐨勪緷鎹��
+ // 浣庣珯鐐逛笉鍋氳闄愬埗锛屼綆绔欑偣娌℃湁杩涗粨缂栧彿鏃朵細缁熶竴浣跨敤 orderId 浣滀负鎵规閿��
+ if (Cools.isEmpty(outTaskParam.getEntryWmsCode())) {
+ return R.error("鎵樼洏銆�" + outTaskParam.getPalletId() + "銆嶈繘浠撶紪鍙蜂笉鑳戒负绌�");
+ }
+ }
+ linesByValidateKey.computeIfAbsent(buildOutOrderValidateKey(outTaskParam), k -> new ArrayList<>()).add(outTaskParam);
}
- for (Map.Entry<String, List<OutTaskParam>> entry : linesByBatch.entrySet()) {
+ // 浠嶄繚鐣欏師鎺ュ彛鐨勬湁搴�/鏃犲簭瑙勫垯锛�
+ // - seq=0 琛ㄧず鏃犲簭锛屽悓鎵规鎵�鏈夋槑缁嗛兘蹇呴』涓� 0锛�
+ // - seq>0 琛ㄧず鏈夊簭锛屽悓鎵规蹇呴』浠� 1 寮�濮嬭繛缁紱
+ // - seq=0 鍜� seq>0 涓嶈兘娣风敤銆�
+ //
+ // 鎵�鏈夋槑缁嗚櫧鐒舵殏涓嶇敓鎴愪换鍔★紝涔熻鍦ㄥ缓鍗曞墠淇濊瘉鍚屼竴浠诲姟鎵规鍐呯殑鏄庣粏椤哄簭鍚堟硶锛�
+ // 鍚﹀垯鍚庣画瀹氭椂鐢熸垚浠诲姟鏃舵墠澶辫触浼氭洿闅捐拷婧埌 ERP 鍘熷璇锋眰銆�
+ for (Map.Entry<String, List<OutTaskParam>> entry : linesByValidateKey.entrySet()) {
List<OutTaskParam> lines = entry.getValue();
OutTaskParam head = lines.get(0);
String oid = head.getOrderId();
- String batchSeq = head.getBatchSeq();
+ String batchSeq = resolveOutOrderTaskBatchKey(head);
boolean hasZero = false;
boolean hasPositive = false;
List<Integer> orderedSeqs = new ArrayList<>(lines.size());
@@ -564,8 +627,14 @@
}
}
+ // 閲嶆柊鎸夋牎楠屽垎缁勯『搴忓睍寮�锛屼繚璇侀噸澶嶆墭鐩樸�佸簱瀛樸�佸簱浣嶆牎楠屼笌涓婇潰鐨勬壒娆℃牎楠岀湅鍒板悓涓�鎵规暟鎹��
+ List<OutTaskParam> groupedParams = new ArrayList<>(params.size());
+ for (List<OutTaskParam> lines : linesByValidateKey.values()) {
+ groupedParams.addAll(lines);
+ }
+
Set<String> seenPallet = new LinkedHashSet<>();
- for (OutTaskParam outTaskParam : params) {
+ for (OutTaskParam outTaskParam : groupedParams) {
String pid = outTaskParam.getPalletId();
String palletKey = pid == null ? "" : pid;
if (!seenPallet.add(palletKey)) {
@@ -592,9 +661,14 @@
// }
// }
+ // 璁㈠崟鍖栧悗浠嶅繀椤荤‘璁ゆ墭鐩樻湁搴撳瓨涓斿綋鍓嶅簱浣嶄负婊″簱浣嶃��
+ //
+ // 杩欓噷鍙仛鍑嗗叆鏍￠獙锛屼笉鍦� controller 灞傛彁鍓嶉攣搴撲綅锛�
+ // - 濡傛灉杩欓噷鎻愬墠鏀� loc_sts锛屼細閫犳垚鈥滆鍗曟湭鎵ц浣嗗簱瀛樺凡琚崰鐢ㄢ�濓紱
+ // - 鐪熸閿佸簱浣嶅繀椤诲拰 WrkMast/WrkDetl 鍒涘缓鍦ㄥ悓涓�涓簨鍔￠噷瀹屾垚锛屾墍浠ヤ粛鐢� outOrderBatch 澶勭悊銆�
List<OutTaskParam> missingStock = Lists.newArrayList();
List<OutTaskParam> missingLoc = Lists.newArrayList();
- for (OutTaskParam outTaskParam : params) {
+ for (OutTaskParam outTaskParam : groupedParams) {
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", outTaskParam.getPalletId()));
if (countLoc == 0) {
missingStock.add(outTaskParam);
@@ -621,8 +695,11 @@
}
return R.error("娌℃湁鎵惧埌鎵樼洏鐮佸搴斿簱浣嶏細" + String.join("锛�", badPalletIds)).add(missingLoc);
}
-
- return openService.outOrderBatch(params);
+ // ERP /outOrder 榛樿鍒涘缓鍙墽琛岃鍗曪細
+ // - status=1锛氬畾鏃跺櫒鍏佽鎵弿骞剁敓鎴愪换鍔★紱
+ // - 鐢熸垚浠诲姟鍚庢湇鍔″眰浼氱珛鍗虫妸 wrk_sts=11 鐨勪换鍔＄疆涓� pdcType=Y锛�
+ // - 鍥犳 ERP 渚т粛淇濇寔鈥滈�氱煡鍚庤嚜鍔ㄥ嚭搴撯�濈殑浣撻獙锛屽彧鏄换鍔＄敓鎴愪粠鎺ュ彛绾跨▼杞Щ鍒颁簡璁㈠崟璋冨害閾捐矾銆�
+ return openService.outOrderCreatePakoutOrder(groupedParams, true);
}
/**
@@ -670,15 +747,66 @@
return openService.pakoutOrderPause(param);
}
- private String buildOutOrderBatchKey(OutTaskParam param) {
- return param.getOrderId() + "#" + param.getBatchSeq();
+ /**
+ * 鍏紑鎵ц鎺ュ彛銆�
+ *
+ * IoT/MQTT 绛夐潪 ERP 鍏ュ彛浼氬厛鍒涘缓 status=0 鐨勫嚭搴撹鍗曪紝鍙湁璋冪敤璇ユ帴鍙ｅ悗鎵嶅厑璁哥敓鎴愪换鍔″拰涓嬪彂銆�
+ * 璇ユ帴鍙ｅ彧鏀寔 execute=1锛涗腑姝粛璧� /order/pakout/pause/default/v1 鐨� execute=2銆�
+ */
+ @PostMapping("/order/pakout/execute/default/v1")
+ public synchronized R pakoutOrderExecute(@RequestBody OpenOrderPakoutExecuteParam param, HttpServletRequest request) {
+ if (request != null) {
+ log.info("[pakoutOrderExecute] cache: {}", param == null ? "null" : JSON.toJSONString(param));
+ request.setAttribute("cache", param);
+ }
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getOrderId())) {
+ return R.error("orderNo is empty");
+ }
+ return openService.pakoutOrderExecute(param);
+ }
+
+ private String buildOutOrderValidateKey(OutTaskParam param) {
+ return param.getOrderId() + "#" + resolveOutOrderTaskBatchKey(param);
+ }
+
+ /**
+ * 璁＄畻 /outOrder 鍏ュ彛鐨勬渶缁堜换鍔℃壒娆￠敭銆�
+ *
+ * 杩欎釜鍊煎繀椤诲拰 OpenServiceImpl.resolvePakoutTaskBatchSeq 淇濇寔涓�鑷达細
+ * - 楂樼珯鐐癸細entryWmsCode锛�
+ * - 浣庣珯鐐癸細orderId銆�
+ *
+ * 鍏ュ彛鏍￠獙鍜屽悗缁敓鎴愪换鍔′娇鐢ㄥ悓涓�鍙ｅ緞锛屾墠鑳戒繚璇� seq 鏍￠獙銆佹壒娆″畧鍗拰 WCS 涓嬪彂鎵规涓�鑷淬��
+ */
+ private String resolveOutOrderTaskBatchKey(OutTaskParam param) {
+ if (param != null && isPendingOutOrderStation(param.getStationId()) && !Cools.isEmpty(param.getEntryWmsCode())) {
+ return param.getEntryWmsCode();
+ }
+ return param == null ? null : param.getOrderId();
+ }
+
+ private boolean isPendingOutOrderStation(String stationId) {
+ try {
+ return Integer.valueOf(stationId) > 600;
+ } catch (Exception ignored) {
+ return false;
+ }
+ }
+
+ /**
+ * 鎺ㄨ崘鍑哄簱绔欑偣
+ */
+ @PostMapping("/pakoutStaNo")
+ public synchronized R pakoutStaNo(@RequestBody List<String> barcodes) {
+ String StaNo = "1,2,3,4,5";
+ return R.ok().add(StaNo);
}
/*************************************鐢佃鏈虹▼搴�***********************************************/
@GetMapping("/locDetl/statistics")
- public R locDetlStatistics(){
+ public synchronized R locDetlStatistics(){
HashMap<String, Object> param = new HashMap<>();
Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(1, 100, param, LocDetl.class));
for (LocDetl locDetl : stockStatis.getRecords()) {
@@ -691,7 +819,7 @@
}
@GetMapping("/line/charts")
- public R locIoLineCharts(){
+ public synchronized R locIoLineCharts(){
Map<String,Object> map=new HashMap<String, Object>();
List<AxisBean> list = new ArrayList<AxisBean>();
@@ -703,8 +831,8 @@
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
- calendar.add(Calendar.DATE, -12);
- for(int i=0;i<12;i++) {
+ calendar.add(Calendar.DATE, -7);
+ for(int i=0;i<7;i++) {
boolean flag = true;
calendar.add(Calendar.DATE, 1);
String str = sf.format(calendar.getTime());
@@ -745,9 +873,7 @@
AxisBean cube5 = new AxisBean();
cube5.setName("鍏ュ簱浣撶Н");
- AxisBean cube15 = new AxisBean();
- cube15.setName("鍑哄簱浣撶Н");
- List<WorkCubeTotalAxis> workCubeTotalAxes = reportQueryMapper.getCubeTotal();
+ List<WorkCubeTotalAxis> workCubeTotalAxes = reportQueryMapper.getInboundCubeTotal();
Map<String, WorkCubeTotalAxis> cubeMap = new HashMap<String, WorkCubeTotalAxis>();
if (workCubeTotalAxes != null) {
for (WorkCubeTotalAxis w : workCubeTotalAxes) {
@@ -757,24 +883,18 @@
}
}
ArrayList<Number> data4 = new ArrayList<Number>();
- ArrayList<Number> data5 = new ArrayList<Number>();
SimpleDateFormat sfCube = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendarCube = Calendar.getInstance();
- calendarCube.add(Calendar.DATE, -12);
- for (int i = 0; i < 12; i++) {
+ calendarCube.add(Calendar.DATE, -7);
+ for (int i = 0; i < 7; i++) {
calendarCube.add(Calendar.DATE, 1);
String str = sfCube.format(calendarCube.getTime());
WorkCubeTotalAxis cubeAxis = cubeMap.get(str);
data4.add(cubeAxis == null || cubeAxis.getCube5Total() == null ? 0 : cubeAxis.getCube5Total());
- data5.add(cubeAxis == null || cubeAxis.getCube15Total() == null ? 0 : cubeAxis.getCube15Total());
}
Number[] array4 = new Number[data4.size()];
cube5.setData(data4.toArray(array4));
list.add(cube5);
- Number[] array5 = new Number[data5.size()];
- cube15.setData(data5.toArray(array5));
- list.add(cube15);
-
}
map.put("rows",list);
return R.ok(map);
@@ -784,7 +904,7 @@
* 鍏ュ嚭搴撴寜灏忔椂鎶樼嚎锛氭í杞翠负銆屽綋鍓嶆暣鐐硅捣鍚戝墠鍏� 12 灏忔椂銆嶆粴鍔ㄧ獥鍙ｏ紝涓庡簱琛� ymd锛坹yyy-MM-dd HH锛夊榻�
*/
@GetMapping("/line/charts/hourly")
- public R locIoLineChartsHourly() {
+ public synchronized R locIoLineChartsHourly() {
Map<String, Object> map = new HashMap<>();
List<AxisBean> list = new ArrayList<>();
@@ -797,6 +917,7 @@
ArrayList<Integer> data2 = new ArrayList<>();
ArrayList<Double> data3 = new ArrayList<>();
ArrayList<Double> data4 = new ArrayList<>();
+ ArrayList<Double> data5 = new ArrayList<>();
List<String> categories = new ArrayList<>();
final int n = 12;
@@ -815,17 +936,22 @@
int outV = 0;
double inC = 0;
double outC = 0;
+ double outD = 0;
for (WorkChartAxis w : listChart) {
if (w.getYmd() != null && key.equals(w.getYmd().trim())) {
inV = w.getInqty();
outV = w.getOutqty();
- inC = w.getCube_inqty();
- outC = w.getCube_outqty();
+ inC = w.getCubeInqty();
+ outC = w.getCubeOutqty();
+ outD = w.getOutTeu();
break;
}
}
data1.add(inV);
data2.add(outV);
+ data3.add(inC);
+ data4.add(outC);
+ data5.add(outD);
calendar.add(Calendar.HOUR_OF_DAY, 1);
}
@@ -841,17 +967,30 @@
outqty.setData(data2.toArray(array2));
list.add(outqty);
- AxisBean cubeInqty = new AxisBean();
- cubeInqty.setName("鍏ュ簱浣撶Н");
- Integer[] array3 = new Integer[data3.size()];
- cubeInqty.setData(data3.toArray(array3));
- list.add(cubeInqty);
+ if (data3.size() >0) {
+ AxisBean cubeInqty = new AxisBean();
+ cubeInqty.setName("鍏ュ簱浣撶Н");
+ Double [] array3 = new Double[data3.size()];
+ cubeInqty.setData(data3.toArray(array3));
+ list.add(cubeInqty);
+ }
- AxisBean cubeOutqty = new AxisBean();
- cubeOutqty.setName("鍑哄簱浣撶Н");
- Integer[] array4 = new Integer[data4.size()];
- cubeOutqty.setData(data4.toArray(array4));
- list.add(cubeOutqty);
+ if (data4.size() >0) {
+ AxisBean cubeOutqty = new AxisBean();
+ cubeOutqty.setName("鍑哄簱浣撶Н");
+ Double[] array4 = new Double[data4.size()];
+ cubeOutqty.setData(data4.toArray(array4));
+ list.add(cubeOutqty);
+ }
+
+ if (data5.size() >0) {
+ AxisBean cubeOutqty = new AxisBean();
+ cubeOutqty.setName("鍑哄簱TEU");
+ Double[] array5 = new Double[data4.size()];
+ cubeOutqty.setData(data5.toArray(array5));
+ list.add(cubeOutqty);
+ }
+
map.put("categories", categories);
map.put("rows", list);
@@ -889,7 +1028,8 @@
}
// 鎬诲簱浣嶆暟
- Integer total = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty());
+ Integer total1 = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty());
+ Integer total = total1>40000?6528:total1;
// 浣跨敤涓�
Integer used = locUseRate.getFqty() + locUseRate.getUqty();
// 搴撲綅浣跨敤鐜�
@@ -936,167 +1076,71 @@
Integer count = 0;
String supp = "";
//璇ヨ鍗曠疮璁″叆鍑哄簱浠舵暟
- List<WrkMast> orderNo = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("user_no", wrkMast.getUserNo()));
- List<WrkMastLog> userNo = wrkMastLogService.selectList(new EntityWrapper<WrkMastLog>().eq("user_no", wrkMast.getUserNo()).eq("wrk_sts",15L));
Integer ioType = wrkMast.getIoType();
+ Integer suppCount = 0;
+ Integer sum = 0;
if (ioType != null && ioType < 100) {
- if (orderNo != null && orderNo.size() > 0) {
- count = orderNo.size();
- }
- if (userNo != null && userNo.size() > 0) {
- count = userNo.size()+count+1;
- }
- supp = count + "";
+ supp = String.valueOf(resolveInboundSupp(wrkMast));
+ map.put("supp", supp);
}else {
- if (userNo != null && userNo.size() > 0) {
- count = userNo.size()+1;
+ String[] split = wrkDetls.get(0).getSupp().split("/");
+ if (split != null && split.length > 0) {
+ sum = Integer.valueOf(split[split.length - 1]);
+ }else {
+ sum = Integer.valueOf(wrkDetls.get(0).getSupp());
}
- supp = count + "";
+ List<WrkMast> userNo = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("user_no", wrkMast.getUserNo()).in("wrk_sts",11,12,21,22,25));
+ suppCount = sum - userNo.size();
+ map.put("supp", suppCount + "/" + sum);
}
- map.put("supp", supp);
//鑰楁椂
- String costTime = resolveCostTime(wrkMast, wrkDetls);
- map.put("costTime", costTime);
+ Long costTime = resolveCostTime(wrkMast);
+ map.put("costTime", String.valueOf(costTime));
return R.ok().add(map);
}
- private String resolveCostTime(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
+ Long resolveCostTime(WrkMast wrkMast) {
+ return resolveCostTime(wrkMast, new Date());
+ }
+
+ Long resolveCostTime(WrkMast wrkMast, Date now) {
if (wrkMast == null || wrkMast.getIoType() == null) {
- return "0";
+ return 0L;
}
-
- Date createTime;
if (wrkMast.getIoType() < 100) {
- createTime = resolveInboundTaskCreateTime(wrkMast, wrkDetls);
- } else {
- createTime = resolveTaskCreateTime(wrkMast);
- }
-
- if (createTime == null) {
- return "0";
- }
-
- long minutes = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis() - createTime.getTime());
- if (minutes < 0L) {
- minutes = 0L;
- }
- return String.valueOf(minutes);
- }
-
- private Date resolveInboundTaskCreateTime(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
- if (wrkMast == null) {
- return null;
- }
-
- if (!Cools.isEmpty(wrkMast.getUserNo())) {
- Date userNoCreateTime = resolveUserNoCreateTime(wrkMast.getUserNo());
- if (userNoCreateTime != null) {
- return userNoCreateTime;
+ if (Cools.isEmpty(wrkMast.getTrainNo())) {
+ return 0L;
}
+ return minutesBetween(wrkMastService.firstInboundCreateTimeByTrainNo(wrkMast.getTrainNo()), resolveTaskCreateTime(wrkMast));
}
-
- String orderNo = resolveOrderNo(wrkMast, wrkDetls);
- if (Cools.isEmpty(orderNo)) {
- return null;
- }
- return resolveOrderCreateTime(orderNo);
+ return minutesBetween(resolveTaskCreateTime(wrkMast), now);
}
- private Date resolveUserNoCreateTime(String userNo) {
- if (Cools.isEmpty(userNo)) {
- return null;
+ int resolveInboundSupp(WrkMast wrkMast) {
+ if (wrkMast == null || wrkMast.getIoType() == null || wrkMast.getIoType() >= 100 || Cools.isEmpty(wrkMast.getTrainNo())) {
+ return 0;
}
- return minDate(
- minCreateTime(wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("user_no", userNo))),
- minCreateTime(wrkMastLogService.selectList(new EntityWrapper<WrkMastLog>().eq("user_no", userNo)))
- );
- }
-
- private String resolveOrderNo(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
- if (wrkMast != null && !Cools.isEmpty(wrkMast.getUserNo())) {
- return wrkMast.getUserNo();
- }
- if (Cools.isEmpty(wrkDetls)) {
- return null;
- }
- for (WrkDetl wrkDetl : wrkDetls) {
- if (wrkDetl != null && !Cools.isEmpty(wrkDetl.getOrderNo())) {
- return wrkDetl.getOrderNo();
- }
- }
- return null;
- }
-
- private Date resolveOrderCreateTime(String orderNo) {
- if (Cools.isEmpty(orderNo)) {
- return null;
- }
-
- Date historyCreateTime = minDate(
- minCreateTime(wrkMastLogService.selectList(new EntityWrapper<WrkMastLog>().eq("user_no", orderNo))),
- minCreateTime(wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>().eq("order_no", orderNo)))
- );
- Date currentCreateTime = minDate(
- minCreateTime(wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("user_no", orderNo))),
- minCreateTime(wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("order_no", orderNo)))
- );
- return minDate(historyCreateTime, currentCreateTime);
- }
-
- private Date minDate(Date first, Date second) {
- if (first == null) {
- return second;
- }
- if (second == null) {
- return first;
- }
- return first.before(second) ? first : second;
+ return wrkMastService.finishedInboundPalletCountByTrainNo(wrkMast.getTrainNo());
}
private Date resolveTaskCreateTime(WrkMast wrkMast) {
if (wrkMast == null) {
return null;
}
- return minDate(minDate(wrkMast.getAppeTime(), wrkMast.getIoTime()), wrkMast.getModiTime());
+ return wrkMast.getAppeTime() == null ? wrkMast.getIoTime() : wrkMast.getAppeTime();
}
- private Date minCreateTime(List<?> list) {
- if (Cools.isEmpty(list)) {
- return null;
+ private Long minutesBetween(Date startTime, Date endTime) {
+ if (startTime == null || endTime == null) {
+ return 0L;
}
- Date min = null;
- for (Object item : list) {
- Date createTime = resolveCreateTime(item);
- if (createTime == null) {
- continue;
- }
- if (min == null || createTime.before(min)) {
- min = createTime;
- }
+ long diff = endTime.getTime() - startTime.getTime();
+ if (diff <= 0) {
+ return 0L;
}
- return min;
- }
-
- private Date resolveCreateTime(Object item) {
- if (item instanceof WrkMast) {
- WrkMast wrkMast = (WrkMast) item;
- return minDate(minDate(wrkMast.getAppeTime(), wrkMast.getIoTime()), wrkMast.getModiTime());
- }
- if (item instanceof WrkMastLog) {
- WrkMastLog wrkMastLog = (WrkMastLog) item;
- return minDate(minDate(wrkMastLog.getAppeTime(), wrkMastLog.getIoTime()), wrkMastLog.getModiTime());
- }
- if (item instanceof WrkDetl) {
- WrkDetl wrkDetl = (WrkDetl) item;
- return minDate(minDate(wrkDetl.getAppeTime(), wrkDetl.getIoTime()), wrkDetl.getModiTime());
- }
- if (item instanceof WrkDetlLog) {
- WrkDetlLog wrkDetlLog = (WrkDetlLog) item;
- return minDate(minDate(wrkDetlLog.getAppeTime(), wrkDetlLog.getIoTime()), wrkDetlLog.getModiTime());
- }
- return null;
+ return diff / MILLIS_PER_MINUTE;
}
}
--
Gitblit v1.9.1