From d16d730f80f856150bf7a186037cadd99dce3274 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 28 四月 2026 21:39:39 +0800
Subject: [PATCH] 双伸出库改成订单出库
---
src/main/java/com/zy/asrs/controller/OpenController.java | 366 +++++++++++++++++++++++++++++++++------------------
1 files changed, 236 insertions(+), 130 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 92b84a7..40d535e 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,16 +524,32 @@
}
/**
- * 7.11 鍑哄簱閫氱煡鍗曪紙浼犻�掓湁搴忔棤搴忚鍒欙級
+ * 7.11 鍑哄簱閫氱煡鍗曪紙浼犻�掓湁搴忔棤搴忚鍒欙級銆�
+ *
+ * stationId <= 600锛氭部鐢ㄥ師瀹炴椂浠诲姟妯″紡锛屾帴鍙ｆ牎楠岄�氳繃鍚庣洿鎺ョ敓鎴� WrkMast/WrkDetl銆�
+ * stationId > 600锛氳繘鍏モ�滃厛寤哄嚭搴撹鍗曘�佸悗缁畾鏃剁敓鎴愪换鍔♀�濈殑寤惰繜妯″紡銆�
+ *
+ * 寤惰繜妯″紡鐨勫叧閿偣锛�
+ * 1. orderId 浣滀负鍑哄簱璁㈠崟鍙疯惤鍒� man_order_pakout.order_no銆�
+ * 2. entryWmsCode 浣滀负杩涗粨缂栧彿淇濆瓨鍒拌鍗曟槑缁嗭紝鍚庣画鐢熸垚浠诲姟鏃跺己鍒朵綔涓� WrkMast.batchSeq銆�
+ * 3. 寤哄崟闃舵鍙牎楠屽簱瀛樺拰婊″簱浣嶏紝涓嶉攣搴撲綅銆佷笉鏀� loc_sts锛岄伩鍏嶆彁鍓嶅崰鐢ㄨ澶囦换鍔¤祫婧愩��
*/
@PostMapping("/outOrder")
public synchronized R outOrder(@RequestBody ArrayList<OutTaskParam> params, HttpServletRequest request) {
if (Cools.isEmpty(params)) {
return R.error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
}
+ int count = params.size();
log.info("[outOrder] cache: {}", JSON.toJSONString(params));
request.setAttribute("cache", params);
- Map<String, List<OutTaskParam>> linesByBatch = new LinkedHashMap<>();
+ // stationId <= 600 鐨勫師濮嬪疄鏃跺嚭搴撲换鍔″垎缁勶紝鍚庨潰鐩存帴浼犵粰 outOrderBatch銆�
+ Map<String, List<OutTaskParam>> linesByBatchSeq = new LinkedHashMap<>();
+ // 缁熶竴鍋氭湁搴�/鏃犲簭鏍￠獙鐨勫垎缁勶細
+ // 浣庣珯鐐规寜 orderId + batchSeq锛涢珮绔欑偣鎸� orderId + entryWmsCode銆�
+ // 楂樼珯鐐瑰悗缁細鎶� entryWmsCode 杞垚浠诲姟 batchSeq锛屽洜姝よ繖閲屽厛鎸夊悓涓�缁村害鏍￠獙 seq銆�
+ Map<String, List<OutTaskParam>> linesByValidateKey = new LinkedHashMap<>();
+ // stationId > 600 鐨勫弬鏁板彧寤哄嚭搴撹鍗曪紝瀹氭椂鍣ㄥ啀鎸夎繘浠撶紪鍙烽�愭壒鐢熸垚浠诲姟銆�
+ List<OutTaskParam> pendingOrderParams = new ArrayList<>();
for (OutTaskParam outTaskParam : params) {
if (Cools.isEmpty(outTaskParam) || Cools.isEmpty(outTaskParam.getOrderId())) {
return R.error("鍑哄簱鍗曞彿涓嶈兘涓虹┖");
@@ -526,14 +560,33 @@
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 鍒ゆ柇鑳藉惁鏀捐涓嬩竴杩涗粨缂栧彿鐨勪緷鎹��
+ if (Cools.isEmpty(outTaskParam.getEntryWmsCode())) {
+ return R.error("鎵樼洏銆�" + outTaskParam.getPalletId() + "銆嶈繘浠撶紪鍙蜂笉鑳戒负绌�");
+ }
+ pendingOrderParams.add(outTaskParam);
+ linesByValidateKey.computeIfAbsent(outTaskParam.getOrderId() + "#" + outTaskParam.getEntryWmsCode(), k -> new ArrayList<>()).add(outTaskParam);
+ } else {
+ linesByBatchSeq.computeIfAbsent(outTaskParam.getBatchSeq(), k -> new ArrayList<>()).add(outTaskParam);
+ linesByValidateKey.computeIfAbsent(buildOutOrderBatchKey(outTaskParam), k -> new ArrayList<>()).add(outTaskParam);
+ }
}
- for (Map.Entry<String, List<OutTaskParam>> entry : linesByBatch.entrySet()) {
+ // 浠嶄繚鐣欏師鎺ュ彛鐨勬湁搴�/鏃犲簭瑙勫垯銆傞珮绔欑偣铏界劧鏆備笉鐢熸垚浠诲姟锛屼篃瑕佸湪寤哄崟鍓嶄繚璇�
+ // 鍚屼竴杩涗粨缂栧彿鍐呯殑鏄庣粏椤哄簭鍚堟硶锛屽惁鍒欏悗缁畾鏃剁敓鎴愪换鍔℃椂鎵嶅け璐ヤ細鏇撮毦杩芥函銆�
+ 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 = isPendingOutOrderStation(head.getStationId()) ? head.getEntryWmsCode() : head.getBatchSeq();
boolean hasZero = false;
boolean hasPositive = false;
List<Integer> orderedSeqs = new ArrayList<>(lines.size());
@@ -564,8 +617,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 +651,11 @@
// }
// }
+ // 寤惰繜寤哄崟妯″紡涔熷繀椤荤‘璁ゆ墭鐩樻湁搴撳瓨涓斿綋鍓嶅簱浣嶄负婊″簱浣嶃��
+ // 杩欓噷鍙仛鍑嗗叆鏍￠獙锛屼笉鍦� controller 灞傛彁鍓嶉攣搴撲綅锛涚湡姝ｉ攣搴撲綅浠嶇敱鍚庣画 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 +682,25 @@
}
return R.error("娌℃湁鎵惧埌鎵樼洏鐮佸搴斿簱浣嶏細" + String.join("锛�", badPalletIds)).add(missingLoc);
}
-
- return openService.outOrderBatch(params);
+ // 娣峰悎璇锋眰涓嬪厛鍒涘缓楂樼珯鐐瑰嚭搴撹鍗曪紝鍐嶅垱寤轰綆绔欑偣瀹炴椂浠诲姟銆�
+ // 杩欐牱鍚屼竴涓� orderId 鍚屾椂鍖呭惈楂樸�佷綆绔欑偣鏃讹紝楂樼珯鐐瑰缓鍗曚笉浼氳浣庣珯鐐瑰垰鐢熸垚鐨勪换鍔¤鍒や负鈥滃凡鏈変换鍔♀�濄��
+ R orderResult = R.ok();
+ if (!pendingOrderParams.isEmpty()) {
+ orderResult = openService.outOrderCreatePakoutOrder(pendingOrderParams);
+ }
+ R directResult = R.ok();
+ if (!linesByBatchSeq.isEmpty()) {
+ directResult = openService.outOrderBatch(linesByBatchSeq, count - pendingOrderParams.size());
+ }
+ if (!linesByBatchSeq.isEmpty() && !pendingOrderParams.isEmpty()) {
+ Map<String, Object> result = new LinkedHashMap<>();
+ result.put("directTaskCount", count - pendingOrderParams.size());
+ result.put("pendingOrderCount", pendingOrderParams.size());
+ result.put("directResult", directResult);
+ result.put("orderResult", orderResult);
+ return R.ok().add(result);
+ }
+ return pendingOrderParams.isEmpty() ? directResult : orderResult;
}
/**
@@ -674,11 +752,28 @@
return param.getOrderId() + "#" + param.getBatchSeq();
}
+ 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,15 +786,15 @@
}
@GetMapping("/line/charts")
- public R locIoLineCharts(){
+ public synchronized R locIoLineCharts(){
Map<String,Object> map=new HashMap<String, Object>();
List<AxisBean> list = new ArrayList<AxisBean>();
List<WorkChartAxis> listChart = reportQueryMapper.getChartAxis();
if(listChart!=null) {
- ArrayList<Integer> data1 = new ArrayList<Integer>();
- ArrayList<Integer> data2 = new ArrayList<Integer>();
+ ArrayList<Number> data1 = new ArrayList<Number>();
+ ArrayList<Number> data2 = new ArrayList<Number>();
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
@@ -723,25 +818,50 @@
}
AxisBean inqty = new AxisBean();
inqty.setName("鍏ュ簱鎵樼洏鏁�");
- Integer[] array1 = new Integer[data1.size()];
+ Number[] array1 = new Number[data1.size()];
inqty.setData(data1.toArray(array1));
list.add(inqty);
AxisBean outqty = new AxisBean();
outqty.setName("鍑哄簱鎵樼洏鏁�");
- Integer[] array2 = new Integer[data2.size()];
+ Number[] array2 = new Number[data2.size()];
outqty.setData(data2.toArray(array2));
list.add(outqty);
AxisBean teu= new AxisBean();
teu.setName("TEU");
List<WorkTeuTotalAxis> workTeuTotalAxes = reportQueryMapper.getteuTotal();
- ArrayList<Integer> data3 = new ArrayList<>();
+ ArrayList<Number> data3 = new ArrayList<Number>();
for (WorkTeuTotalAxis w : workTeuTotalAxes) {
data3.add(w.getTeu_total());
}
- Integer[] array3 = new Integer[data3.size()];
+ Number[] array3 = new Number[data3.size()];
teu.setData(data3.toArray(array3));
list.add(teu);
+
+ AxisBean cube5 = new AxisBean();
+ cube5.setName("鍏ュ簱浣撶Н");
+ List<WorkCubeTotalAxis> workCubeTotalAxes = reportQueryMapper.getInboundCubeTotal();
+ Map<String, WorkCubeTotalAxis> cubeMap = new HashMap<String, WorkCubeTotalAxis>();
+ if (workCubeTotalAxes != null) {
+ for (WorkCubeTotalAxis w : workCubeTotalAxes) {
+ if (w.getYmd() != null) {
+ cubeMap.put(w.getYmd(), w);
+ }
+ }
+ }
+ ArrayList<Number> data4 = 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, 1);
+ String str = sfCube.format(calendarCube.getTime());
+ WorkCubeTotalAxis cubeAxis = cubeMap.get(str);
+ data4.add(cubeAxis == null || cubeAxis.getCube5Total() == null ? 0 : cubeAxis.getCube5Total());
+ }
+ Number[] array4 = new Number[data4.size()];
+ cube5.setData(data4.toArray(array4));
+ list.add(cube5);
}
map.put("rows",list);
return R.ok(map);
@@ -751,7 +871,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<>();
@@ -762,6 +882,9 @@
ArrayList<Integer> data1 = new ArrayList<>();
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;
@@ -778,15 +901,24 @@
int inV = 0;
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.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);
}
@@ -801,6 +933,31 @@
Integer[] array2 = new Integer[data2.size()];
outqty.setData(data2.toArray(array2));
list.add(outqty);
+
+ if (data3.size() >0) {
+ AxisBean cubeInqty = new AxisBean();
+ cubeInqty.setName("鍏ュ簱浣撶Н");
+ Double [] array3 = new Double[data3.size()];
+ cubeInqty.setData(data3.toArray(array3));
+ list.add(cubeInqty);
+ }
+
+ 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);
@@ -838,7 +995,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();
// 搴撲綅浣跨敤鐜�
@@ -877,131 +1035,79 @@
}
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(Integer.valueOf(param.getTaskNo()));
- String costTime = resolveCostTime(wrkMast, wrkDetls);
HashMap<String, Object> map = new HashMap<>();
map.put("taskNo", param.getTaskNo());
map.put("ioType", wrkMast.getIoType());
- map.put("costTime", costTime);
- map.put("costTimeStr", costTime);
map.put("wrkDetls", wrkDetls);
+ Integer count = 0;
+ String supp = "";
+ //璇ヨ鍗曠疮璁″叆鍑哄簱浠舵暟
+ Integer ioType = wrkMast.getIoType();
+ Integer suppCount = 0;
+ Integer sum = 0;
+ if (ioType != null && ioType < 100) {
+ supp = String.valueOf(resolveInboundSupp(wrkMast));
+ map.put("supp", supp);
+ }else {
+ 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());
+ }
+ 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);
+ }
+
+ //鑰楁椂
+ Long costTime = resolveCostTime(wrkMast);
+ map.put("costTime", String.valueOf(costTime));
return R.ok().add(map);
}
- private String resolveCostTime(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
- Date createTime = resolveOrderCreateTime(resolveOrderNo(wrkMast, wrkDetls));
- if (createTime == null) {
- 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);
+ Long resolveCostTime(WrkMast wrkMast) {
+ return resolveCostTime(wrkMast, new Date());
}
- private String resolveOrderNo(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
- if (wrkMast != null && !Cools.isEmpty(wrkMast.getUserNo())) {
- return wrkMast.getUserNo();
+ Long resolveCostTime(WrkMast wrkMast, Date now) {
+ if (wrkMast == null || wrkMast.getIoType() == null) {
+ return 0L;
}
- if (Cools.isEmpty(wrkDetls)) {
- return null;
- }
- for (WrkDetl wrkDetl : wrkDetls) {
- if (wrkDetl != null && !Cools.isEmpty(wrkDetl.getOrderNo())) {
- return wrkDetl.getOrderNo();
+ if (wrkMast.getIoType() < 100) {
+ if (Cools.isEmpty(wrkMast.getTrainNo())) {
+ return 0L;
}
+ return minutesBetween(wrkMastService.firstInboundCreateTimeByTrainNo(wrkMast.getTrainNo()), resolveTaskCreateTime(wrkMast));
}
- return null;
+ return minutesBetween(resolveTaskCreateTime(wrkMast), now);
}
- private Date resolveOrderCreateTime(String orderNo) {
- if (Cools.isEmpty(orderNo)) {
- return null;
+ int resolveInboundSupp(WrkMast wrkMast) {
+ if (wrkMast == null || wrkMast.getIoType() == null || wrkMast.getIoType() >= 100 || Cools.isEmpty(wrkMast.getTrainNo())) {
+ return 0;
}
-
- Date historyCreateTime = minDate(
- minCreateTime(wrkMastLogService.selectList(new EntityWrapper<WrkMastLog>().eq("user_no", orderNo))),
- minCreateTime(wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>().eq("order_no", orderNo)))
- );
- if (historyCreateTime != null) {
- return historyCreateTime;
- }
-
- return minDate(
- minCreateTime(wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("user_no", orderNo))),
- minCreateTime(wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("order_no", orderNo)))
- );
- }
-
- 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 firstDate(wrkMast.getAppeTime(), wrkMast.getIoTime(), wrkMast.getModiTime());
+ return wrkMast.getAppeTime() == null ? wrkMast.getIoTime() : wrkMast.getAppeTime();
}
- private Date firstDate(Date... dates) {
- if (dates == null || dates.length == 0) {
- return null;
+ private Long minutesBetween(Date startTime, Date endTime) {
+ if (startTime == null || endTime == null) {
+ return 0L;
}
- for (Date date : dates) {
- if (date != null) {
- return date;
- }
+ long diff = endTime.getTime() - startTime.getTime();
+ if (diff <= 0) {
+ return 0L;
}
- return null;
- }
-
- private Date minCreateTime(List<?> list) {
- if (Cools.isEmpty(list)) {
- return null;
- }
- Date min = null;
- for (Object item : list) {
- Date createTime = resolveCreateTime(item);
- if (createTime == null) {
- continue;
- }
- if (min == null || createTime.before(min)) {
- min = createTime;
- }
- }
- return min;
- }
-
- private Date resolveCreateTime(Object item) {
- if (item instanceof WrkMast) {
- WrkMast wrkMast = (WrkMast) item;
- return firstDate(wrkMast.getAppeTime(), wrkMast.getIoTime(), wrkMast.getModiTime());
- }
- if (item instanceof WrkMastLog) {
- WrkMastLog wrkMastLog = (WrkMastLog) item;
- return firstDate(wrkMastLog.getAppeTime(), wrkMastLog.getIoTime(), wrkMastLog.getModiTime());
- }
- if (item instanceof WrkDetl) {
- WrkDetl wrkDetl = (WrkDetl) item;
- return firstDate(wrkDetl.getAppeTime(), wrkDetl.getIoTime(), wrkDetl.getModiTime());
- }
- if (item instanceof WrkDetlLog) {
- WrkDetlLog wrkDetlLog = (WrkDetlLog) item;
- return firstDate(wrkDetlLog.getAppeTime(), wrkDetlLog.getIoTime(), wrkDetlLog.getModiTime());
- }
- return null;
+ return diff / MILLIS_PER_MINUTE;
}
}
--
Gitblit v1.9.1