From dea586adf232c722e8d2dfa833c3d7711a1019df Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 02 二月 2026 13:37:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java | 1
src/main/java/com/zy/asrs/controller/OpenController.java | 54 +++++++++++++
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 4 +
src/main/java/com/zy/asrs/entity/param/PdaPickListParam.java | 8 ++
src/main/webapp/static/i18n/en.json | 2
src/main/java/com/zy/asrs/service/OpenService.java | 2
src/main/resources/mapper/WrkDetlMapper.xml | 4 +
src/main/java/com/zy/asrs/entity/LocDetl.java | 3
src/main/webapp/static/i18n/zh-cn.json | 48 ++++++------
src/main/java/com/zy/asrs/entity/Mat.java | 2
src/main/java/com/zy/asrs/entity/param/PickWrkDetlListParam.java | 39 +++++++++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 6
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 41 ++++++++++
src/main/resources/application.yml | 4
src/main/java/com/zy/asrs/service/WrkDetlService.java | 1
src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java | 16 ++--
16 files changed, 196 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 73c7c76..c7e4761 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,11 +1,14 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.WaitPakinService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -32,6 +35,8 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private WaitPakinService waitPakinService;
@PostMapping("/order/matSync/default/v1")
@AppAuth(memo = "response.mat_sync_interface")
@@ -157,6 +162,55 @@
return r;
}
+ /**
+ * PDA妫�绱㈢洏鐐规暟閲�
+ */
+ @PostMapping("/pick/v1/getPickList")
+ @AppAuth(memo = "PDA Inventory Count Lookup")
+ public synchronized R getPickList(@RequestHeader(required = false) String appkey,
+ @RequestBody PdaPickListParam param,
+ HttpServletRequest request) {
+// auth(appkey, param, request);
+
+ List<PickWrkDetlListParam> list = openService.getPickList(param);
+ if (!list.isEmpty()) {
+ return R.ok(list);
+ }
+ return R.error("Location does not exist or has no details.");
+ }
+
+ /**
+ * PDA妫�绱㈢粍鎵樻暟鎹�
+ */
+ @PostMapping("/comb/v1/getCombList")
+ @AppAuth(memo = "PDA Get Comb List")
+ public synchronized R getCombList(@RequestHeader(required = false) String appkey,
+ @RequestBody PdaPickListParam param,
+ HttpServletRequest request) {
+// auth(appkey, param, request);
+
+ List<WaitPakin> list = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
+ if (!list.isEmpty()) {
+ return R.ok(list);
+ }
+ return R.error("Combs does not exist or has no details.");
+ }
+
+ /**
+ * PDA妫�绱㈢粍鎵樻暟鎹�
+ */
+ @PostMapping("/comb/v1/deleteComb")
+ @AppAuth(memo = "PDA Delete Comb")
+ public synchronized R deleteComb(@RequestHeader(required = false) String appkey,
+ @RequestBody PdaPickListParam param,
+ HttpServletRequest request) {
+ boolean result = waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
+ if(result) {
+ return R.ok();
+ }
+ return R.error("Combs does not exist or has no details.");
+ }
+
private void auth(String appkey, Object obj, HttpServletRequest request) {
log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
request.setAttribute("cache", obj);
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 9de6142..4009376 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -158,6 +158,9 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "缁勫悎閿�")
+ private String mixNumber;
+
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 3501573..9c729ff 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -334,6 +334,8 @@
@TableField("area_id")
private String areaId;
+
+
public Mat() {}
public Mat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,String areaId) {
diff --git a/src/main/java/com/zy/asrs/entity/param/PdaPickListParam.java b/src/main/java/com/zy/asrs/entity/param/PdaPickListParam.java
new file mode 100644
index 0000000..230a724
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/PdaPickListParam.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class PdaPickListParam {
+ String barcode;
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/PickWrkDetlListParam.java b/src/main/java/com/zy/asrs/entity/param/PickWrkDetlListParam.java
new file mode 100644
index 0000000..c6b2546
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/PickWrkDetlListParam.java
@@ -0,0 +1,39 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class PickWrkDetlListParam {
+
+ // 鐗╂枡缂栧彿
+ private String matnr;
+
+ // 鐗╂枡鍚嶇О
+ private String maknx;
+
+ //鍗曟嵁缂栧彿
+ private String orderNo;
+ //閲囪喘鍗曞彿
+ private String boxType3;
+
+ //瀹㈡埛PO
+ private String standby1;
+
+ //鏉＄爜UPC
+ private String standby2;
+
+ //瀹㈡埛sku
+ private String standby3;
+
+ // 瀹㈡埛淇℃伅
+ private String manu;
+
+ // 澶囨敞
+ private String memo;
+
+ // 鐗╂枡鏁伴噺
+ private Double count;
+
+ private Double total;
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
index 9e0a7c1..913a5f3 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
@@ -31,5 +31,6 @@
int updateIoTime(@Param("workNo") Integer workNo, @Param("ioTime") Date ioTime);
List<WrkDetl> findByWorkNo(Integer workNo);
+ List<WrkDetl> findByBarcode(String barcode);
}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index afd90b1..6f9e745 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -43,4 +43,6 @@
* @param param
*/
void syncMat(MatSyncParam param);
+ List<PickWrkDetlListParam> getPickList(PdaPickListParam param);
+
}
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlService.java b/src/main/java/com/zy/asrs/service/WrkDetlService.java
index 77539cb..b78e8f6 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlService.java
@@ -19,6 +19,7 @@
boolean updateAnfme(Double anfme, Integer wrkNo, String matnr, String batch);
List<WrkDetl> selectAndLogByOrderNo(String orderNo);
+ List<WrkDetl> findByBarcode(String barcode);
boolean updateInspect(Integer wrkNo, String matnr, String batch);
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 1dcd11a..52ba404 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -85,9 +85,9 @@
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
- if(param.getCombMats().size()>1){
- throw new CoolException("response.extract_one_product_or_refresh");
- }
+// if(param.getCombMats().size()>1){
+// throw new CoolException("response.extract_one_product_or_refresh");
+// }
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
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 5d8970a..8ada1a1 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -48,7 +48,8 @@
private TagService tagService;
@Autowired
private TagMapper tagMapper;
-
+ @Autowired
+ private WrkDetlService wrkDetlService;
@Override
@Transactional
public void pakinOrderCreate(OpenOrderPakinParam param) {
@@ -543,5 +544,43 @@
}
}
+ @Override
+ @Transactional
+ public List<PickWrkDetlListParam> getPickList(PdaPickListParam param) {
+ List<WrkDetl> wrkDetls = wrkDetlService.findByBarcode(param.getBarcode());
+ List<PickWrkDetlListParam> result = new ArrayList<>();
+ wrkDetls.forEach(wrkDetl -> {
+ Double total;
+ EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+ LocDetl locDetl = locDetlService.selectOne(
+ wrapper.eq("zpallet", wrkDetl.getZpallet())
+ .eq("matnr", wrkDetl.getMatnr())
+ );
+ // 鍙嫞鎬婚噺锛氫紭鍏堝彇搴撳瓨琛紝鍚﹀垯鍙栦綔涓氭暟閲�
+ if (Cools.isEmpty(locDetl)) {
+ total = wrkDetl.getAnfme();
+ } else {
+ total = locDetl.getAnfme();
+ }
+ // ===== 缁勮杩斿洖瀵硅薄 =====
+ PickWrkDetlListParam dto = new PickWrkDetlListParam();
+ dto.setMatnr(wrkDetl.getMatnr());
+ dto.setMaknx(wrkDetl.getMaktx());
+ dto.setOrderNo(wrkDetl.getOrderNo());
+// dto.setBoxType3(wrkDetl.getBoxType3());
+// dto.setStandby1(wrkDetl.getStandby1());
+// dto.setStandby2(wrkDetl.getStandby2());
+// dto.setStandby3(wrkDetl.getStandby3());
+ dto.setManu(wrkDetl.getManu());
+ dto.setMemo(wrkDetl.getMemo());
+ // 褰撳墠鎷ｈ揣鏁伴噺
+ dto.setCount(wrkDetl.getAnfme());
+ // 鍙嫞鎬绘暟閲�
+ dto.setTotal(total);
+ result.add(dto);
+ });
+
+ return result;
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index 84d033a..ea18fda 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -97,4 +97,8 @@
public boolean updateIoTime(Integer workNo, Date ioTime) {
return this.baseMapper.updateIoTime(workNo, ioTime) > 0;
}
+ @Override
+ public List<WrkDetl> findByBarcode(String barcode) {
+ return this.baseMapper.findByBarcode(barcode);
+ }
}
diff --git a/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java b/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
index 3bad283..bbcc288 100644
--- a/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
+++ b/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
@@ -24,7 +24,7 @@
@Slf4j
public class LedWebsocket {
- private static final String[] WEEK = {"response.week_sun","response.week_mon","response.week_tue","response.week_wed","response.week_thu","response.week_fri","response.week_sat"};
+ private static final String[] WEEK = {"Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"};
@Autowired
private ReportQueryMapper reportQueryMapper;
@@ -51,22 +51,22 @@
LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
if(locUseRate!=null) {
Map<String, Object> map = new HashMap<>();
- map.put("name", "response.loc_in_store");
+ map.put("name", "In Stock Location");
map.put("value", locUseRate.getFqty());
pie.add(map);
Map<String, Object> map1 = new HashMap<>();
- map1.put("name", "response.loc_empty");
+ map1.put("name", "Empty Location");
map1.put("value", locUseRate.getOqty());
pie.add(map1);
Map<String, Object> map2 = new HashMap<>();
- map2.put("name", "response.loc_used");
+ map2.put("name", "Used Location");
map2.put("value", locUseRate.getUqty());
pie.add(map2);
Map<String, Object> map3 = new HashMap<>();
- map3.put("name", "response.loc_disabled");
+ map3.put("name", "Disabled Location");
map3.put("value", locUseRate.getXqty());
pie.add(map3);
}
@@ -108,12 +108,12 @@
}
}
AxisBean inqty = new AxisBean();
- inqty.setName("response.in_qty");
+ inqty.setName("Inbound Qty");
Integer[] array1 = new Integer[data1.size()];
inqty.setData(data1.toArray(array1));
list.add(inqty);
AxisBean outqty = new AxisBean();
- outqty.setName("response.out_qty");
+ outqty.setName("Outbound Qty");
Integer[] array2 = new Integer[data2.size()];
outqty.setData(data2.toArray(array2));
list.add(outqty);
@@ -170,7 +170,7 @@
return;
}
if (basDevp.getDevMk().equals("O")){
- basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 1001));
+ basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 100));
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e9847c9..b289f71 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -45,10 +45,10 @@
licensePath: license.lic
publicKeysStorePath: publicCerts.keystore
led:
- ip: locLHOST
+ ip: localhost
url: arydasrs
port: 8080
- id: 1001
+ id: 100
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index c243625..be55906 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -133,4 +133,8 @@
<select id="findByWorkNo" resultMap="BaseResultMap">
select wrk_no, matnr, maktx, anfme ,specs,batch from asr_wrk_detl where 1=1 and wrk_no = #{workNo}
</select>
+
+ <select id="findByBarcode" resultMap="BaseResultMap">
+ select * from asr_wrk_detl where 1=1 and zpallet = #{barcode}
+ </select>
</mapper>
diff --git a/src/main/webapp/static/i18n/en.json b/src/main/webapp/static/i18n/en.json
index 0c83965..67ca329 100644
--- a/src/main/webapp/static/i18n/en.json
+++ b/src/main/webapp/static/i18n/en.json
@@ -73,7 +73,7 @@
"complete": "Complete",
"configuration": "Configuration",
"confirm": "OK",
- "confirm_adjust_location_detail": "Are you sure to adjust details for location {val}?",
+ "confirm_adjust_location_detail": "Are you sure to adjust details for location?",
"confirm_cancel_erp_order": "Current task linked to ERP sales order. Cancellation will regenerate outbound task. Continue?",
"confirm_cancel_work_order": "Confirm cancel this work order?",
"confirm_complete_work_order": "Confirm complete this work order?",
diff --git a/src/main/webapp/static/i18n/zh-cn.json b/src/main/webapp/static/i18n/zh-cn.json
index 75749df..131f765 100644
--- a/src/main/webapp/static/i18n/zh-cn.json
+++ b/src/main/webapp/static/i18n/zh-cn.json
@@ -64,7 +64,7 @@
"color_updated": "棰滆壊宸叉洿鏂�",
"complete": "瀹屾垚",
"confirm": "纭畾",
- "confirm_adjust_location_detail": "纭畾璋冩暣{val}搴撲綅鐨勬槑缁嗗悧锛�",
+ "confirm_adjust_location_detail": "纭畾璋冩暣搴撲綅鐨勬槑缁嗗悧锛�",
"confirm_cancel_erp_order": "褰撳墠浠诲姟鍏宠仈ERP閿�鍞崟锛屽彇娑堝皢閲嶆柊鐢熸垚鍑哄簱浣滀笟锛屾槸鍚︾户缁紵",
"confirm_cancel_work_order": "纭鍙栨秷璇ョ瑪宸ヤ綔妗ｏ紵",
"confirm_complete_work_order": "纭瀹屾垚璇ョ瑪宸ヤ綔妗ｏ紵",
@@ -89,7 +89,7 @@
"confirm_pick_work_order": "鎷ｆ枡鍏ュ簱璇ョ瑪宸ヤ綔妗ｏ紵",
"confirm_pre_existing_exception": "浠诲姟鍙戠敓鍏堝叆鍝佸紓甯搞�傚闇�閲嶆柊鍏ュ簱锛岃纭繚璐х墿宸叉斁鑷冲爢鍨涙満鍑哄簱绔欙紒",
"confirm_save_change": "淇濆瓨淇敼?",
- "confirm_sync_file": "纭鍚屾 [{{filename}}] 鏂囦欢鍚楋紵",
+ "confirm_sync_file": "纭鍚屾鏂囦欢鍚楋紵",
"count": "鐩�",
"crane": "鍫嗗灈鏈�",
"crane_amount": "鍫嗗灈鏈烘暟閲�",
@@ -471,15 +471,15 @@
"response.cancel_transfer_failed_target_not_exist": "鍙栨秷搴撲綅杞Щ澶辫触锛岀洰鏍囧簱浣嶄笉瀛樺湪锛寋0}",
"response.cancel_work_master_failed": "鍙栨秷宸ヤ綔妗ｅけ璐�",
"response.cancel_work_master_failed_loc_not_exist": "鍙栨秷宸ヤ綔妗ｅけ璐ワ紝搴撲綅涓嶅瓨鍦紝{0}",
- "response.change_loc_status_failed": "Change搴撲綅鐘舵�佸け璐�",
- "response.change_location_status_failed": "Change搴撲綅鐘舵�佸け璐�",
+ "response.change_loc_status_failed": "淇敼搴撲綅鐘舵�佸け璐�",
+ "response.change_location_status_failed": "淇敼搴撲綅鐘舵�佸け璐�",
"response.china_grid": "鍥界綉",
"response.clear_order_detail_failed": "娓呯┖璁㈠崟鏄庣粏澶辫触",
"response.code_exists": "缂栫爜宸插瓨鍦�",
"response.code_or_name_exists": "缂栫爜鎴栧悕绉板凡瀛樺湪",
- "response.comb_success": "Comb鎴愬姛",
- "response.confirm_complete": "纭Complete",
- "response.confirm_picking_outbound_failed": "纭Picking鍑哄簱澶辫触",
+ "response.comb_success": "缁勬墭鎴愬姛",
+ "response.confirm_complete": "纭瀹屾垚",
+ "response.confirm_picking_outbound_failed": "纭鎷ｆ枡鍑哄簱澶辫触",
"response.crane_add": "鍫嗗灈鏈烘柊澧�",
"response.crane_delete": "鍫嗗灈鏈哄垹闄�",
"response.crane_error_add": "鍫嗗灈鏈哄紓甯告坊鍔�",
@@ -498,16 +498,16 @@
"response.data_error": "鏁版嵁閿欒",
"response.data_exists": "鏁版嵁宸插瓨鍦�",
"response.data_not_found": "鏈壘鍒版暟鎹�",
- "response.data_processing_inbound": "鏁版嵁Processing鍏ュ簱",
+ "response.data_processing_inbound": "鏉＄爜閲嶅",
"response.db_update_error": "瀵规暟鎹簱淇敼鍑洪敊锛�",
- "response.delete_failed_contact_admin": "鍒犻櫎澶辫触ContactAdmin",
+ "response.delete_failed_contact_admin": "鍒犻櫎澶辫触",
"response.delete_stock_detail_failed": "鍒犻櫎搴撳瓨璇︽儏澶辫触",
- "response.delete_stocktake_detail_failed": "鍒犻櫎Stocktake璇︽儏澶辫触",
+ "response.delete_stocktake_detail_failed": "鍒犻櫎璇︽儏澶辫触",
"response.delete_success": "鍒犻櫎鎴愬姛",
"response.empty_pallet_inbound": "绌烘澘鍏ュ簱",
"response.empty_pallet_outbound": "绌烘澘鍑哄簱",
- "response.empty_plate_inbound_task_exists": "涓虹┖Plate鍏ュ簱浠诲姟宸插瓨鍦�",
- "response.empty_plate_outbound_forbidden_inbound": "涓虹┖Plate鍑哄簱Forbidden鍏ュ簱",
+ "response.empty_plate_inbound_task_exists": "绌烘澘鍏ュ簱浠诲姟宸插瓨鍦�",
+ "response.empty_plate_outbound_forbidden_inbound": "绌烘澘鍑哄簱绂佹鍏ュ簱",
"response.enter_activation_code": "EnterActivation缂栫爜",
"response.existing_working_data_cannot_complete": "瀛樺湪浣滀笟涓暟鎹紝涓嶈兘瀹岀粨",
"response.export_daily_inbound_detail": "鏃ュ叆搴撴槑缁嗙粺璁″鍑�",
@@ -519,8 +519,8 @@
"response.fetch_outbound_station_failed": "鑾峰彇鍑哄簱鍙ｅけ璐�",
"response.fifo_handling": "鍏堝叆鍝佸鐞�",
"response.friday": "鏄熸湡浜�",
- "response.front_loc_has_goods_forbid_out": "Front搴撲綅HasGoodsForbid鍑哄簱",
- "response.front_loc_has_in_task_forbid_out": "Front搴撲綅Has鍦ㄤ换鍔orbidOut",
+ "response.front_loc_has_goods_forbid_out": "娴呭簱浣嶆湁鐗╃姝㈠嚭搴�",
+ "response.front_loc_has_in_task_forbid_out": "娴呭簱浣嶅湪鎵ц浠诲姟绂佹鍑哄簱",
"response.full_pallet_inbound": "鍏ㄦ澘鍏ュ簱",
"response.full_pallet_out": "鏁存墭鍑哄簱",
"response.full_pallet_outbound": "鍏ㄦ澘鍑哄簱",
@@ -566,16 +566,16 @@
"response.loc_mast_export": "搴撲綅瀵煎嚭",
"response.loc_mast_init": "鍒濆鍖栧簱浣�",
"response.loc_mast_update": "搴撲綅淇敼",
- "response.loc_material_not_exist": "搴撲綅Material涓嶅瓨鍦�",
- "response.loc_not_adjustable": "搴撲綅涓岮djustable",
+ "response.loc_material_not_exist": "搴撳瓨鏄庣粏涓嶅瓨鍦�",
+ "response.loc_not_adjustable": "鐩樼偣搴撲綅鐘舵�佸紓甯�",
"response.loc_not_exist": "搴撲綅涓嶅瓨鍦�",
"response.loc_not_exist_simple": "搴撲綅涓嶅瓨鍦ㄧ畝鍗�",
"response.loc_not_found": "搴撲綅涓嶆壘鍒�",
"response.loc_not_in_stock_status": "搴撲綅涓嶅湪搴撳瓨鐘舵��",
- "response.loc_not_in_store": "搴撲綅涓嶅湪Store",
+ "response.loc_not_in_store": "搴撳瓨鏄庣粏涓嶅瓨鍦�",
"response.loc_not_in_store_status": "{0}搴撲綅涓嶆槸鍦ㄥ簱鐘舵��",
"response.loc_status_add": "搴撲綅鐘舵�佹柊澧�",
- "response.loc_status_changed": "搴撲綅鐘舵�丆hanged",
+ "response.loc_status_changed": "搴撲綅鐘舵�佸紓甯�",
"response.loc_status_delete": "搴撲綅鐘舵�佸垹闄�",
"response.loc_status_error_not_empty": "搴撲綅鐘舵�佸紓甯革紝闈炵┖鏉跨姸鎬侊細{0}",
"response.loc_status_export": "搴撲綅鐘舵�佸鍑�",
@@ -585,7 +585,7 @@
"response.location_transfer": "搴撲綅绉昏浆",
"response.login": "鐧诲綍",
"response.manu_cancel": "鎵嬪姩鍙栨秷",
- "response.manu_complete": "ManuComplete",
+ "response.manu_complete": "鎵嬪姩瀹屾垚",
"response.manual_add_order": "鎵嬪姩娣诲姞璁㈠崟",
"response.manual_delete_order": "鎵嬪姩鍒犻櫎璁㈠崟",
"response.manual_modify_order": "鎵嬪姩淇敼璁㈠崟",
@@ -607,11 +607,11 @@
"response.mat_sync_interface": "鍟嗗搧淇℃伅鍚屾鎺ュ彛",
"response.mat_update": "鐗╂枡淇敼",
"response.material_data_error": "鐗╂枡鏁版嵁閿欒锛岃鑱旂郴绠＄悊鍛�",
- "response.material_not_exist": "Material涓嶅瓨鍦�",
+ "response.material_not_exist": "鐗╂枡涓嶅瓨鍦�",
"response.material_not_found": "鐗╂枡: {{matnr}} 鍦ㄥ簱浣嶄腑涓嶅瓨鍦�",
- "response.material_not_in_stock": "Material涓嶅湪搴撳瓨",
- "response.material_qty_error": "Material鏁伴噺閿欒",
- "response.memo_auto_empty_pallet_out": "澶囨敞Auto涓虹┖Pallet鍑哄簱",
+ "response.material_not_in_stock": "鐗╂枡涓嶅湪搴撳瓨",
+ "response.material_qty_error": "鐗╂枡鏁伴噺閿欒",
+ "response.memo_auto_empty_pallet_out": "鑷姩绌烘澘鍑哄簱",
"response.menu_add": "娣诲姞鑿滃崟",
"response.menu_delete": "鍒犻櫎鑿滃崟",
"response.menu_edit": "缂栬緫鑿滃崟",
@@ -637,7 +637,7 @@
"response.no_empty_pallet": "娌℃湁绌烘墭鐩�",
"response.no_such_product": "涓嶅瓨鍦ㄨ搴撲綅鐗╂枡",
"response.no_valid_empty_pallet_loc": "鍚堝苟鍒嗙粍搴撲綅澶辫触",
- "response.no_valid_out_loc": "鍚alid鍑哄簱搴撲綅",
+ "response.no_valid_out_loc": "鍚堝苟鏃舵湭鎵惧埌鍑哄簱搴撲綅",
"response.node_add": "璐т綅鏂板",
"response.node_delete": "璐т綅鍒犻櫎",
"response.node_detail": "璐т綅璇︽儏",
--
Gitblit v1.9.1