From 2e82ef6fd6dfbcb1eb88a8d4b705eae7fb99065b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 06 六月 2025 17:04:11 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/asrs/service/WorkService.java | 2
src/main/webapp/static/js/pakStore/locCheckOut.js | 27 +++
src/main/java/com/zy/asrs/entity/InventoryCheckOrder.java | 4
src/main/webapp/views/pakStore/locCheckOut.html | 12 +
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 28 ++-
src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java | 68 ++++----
src/main/java/com/zy/common/web/WcsController.java | 16 +-
src/main/webapp/views/inventoryCheckOrder/inventoryCheckOrder.html | 6
src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java | 66 +++++---
src/main/java/com/zy/nc/task/PlanOrderTask.java | 32 ++--
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 36 ++++
src/main/java/com/zy/asrs/entity/param/StockOutParam.java | 3
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 10 +
src/main/webapp/static/js/common.js | 4
src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java | 68 +++++----
15 files changed, 239 insertions(+), 143 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
index 9c7d50f..ef95b5a 100644
--- a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
+++ b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
@@ -22,6 +22,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
public class InventoryCheckOrderController extends BaseController {
@@ -63,14 +64,14 @@
@RequestMapping("/inventoryCheckOrder/select/status/1")
@ManagerAuth()
- public R availableTakeCheckSite(){
+ public R availableTakeCheckSite() {
return R.ok().add(inventoryCheckOrderService.selectList(new EntityWrapper<InventoryCheckOrder>().eq("status", "1")));
}
@RequestMapping(value = "/inventoryCheckOrder/nav/list/auth")
@ManagerAuth
- public R navList(@RequestParam(required = false) String orderNo){
+ public R navList(@RequestParam(required = false) String orderNo) {
EntityWrapper<InventoryCheckOrder> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
@@ -82,6 +83,15 @@
return R.ok().add(orders);
}
+ @RequestMapping(value = "/inventoryCheckOrder/nav/auth")
+ @ManagerAuth
+ public R navList() {
+ EntityWrapper<InventoryCheckOrder> wrapper = new EntityWrapper<>();
+ List<InventoryCheckOrder> orders = inventoryCheckOrderService.selectList(wrapper.eq("status", "1"));
+ List<String> locNoList = orders.stream().map(InventoryCheckOrder::getOrderNo).distinct().collect(Collectors.toList());
+ return R.ok().add(locNoList);
+ }
+
@RequestMapping(value = "/inventoryCheckOrder/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
@@ -90,24 +100,26 @@
@RequestMapping(value = "/inventoryCheckOrder/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<InventoryCheckOrder> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(InventoryCheckOrder.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(inventoryCheckOrderService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -117,21 +129,21 @@
}
}
- @PostMapping (value = "/inventoryCheckOrder/add/auth")
+ @PostMapping(value = "/inventoryCheckOrder/add/auth")
@ManagerAuth
public R add(@RequestBody InventoryCheckOrder inventoryCheckOrder) {
String orderNo = inventoryCheckOrder.getOrderNo();
long time = new Date().getTime();
if (Cools.isEmpty(orderNo)) {
- switch (inventoryCheckOrder.getArea()){
+ switch (inventoryCheckOrder.getArea()) {
case "鍫嗗灈鏈�":
- orderNo = "DDJ"+time;
+ orderNo = "DDJ" + time;
break;
case "鍥涘悜搴�":
- orderNo = "SXK"+time;
+ orderNo = "SXK" + time;
break;
case "CTU":
- orderNo = "CTU"+time;
+ orderNo = "CTU" + time;
break;
}
inventoryCheckOrder.setOrderNo(orderNo);
@@ -142,7 +154,7 @@
return R.parse("鍗曟嵁缂栧彿宸茬粡瀛樺湪锛�" + orderNo);
}
- inventoryCheckOrder.setCreateBy(getUserId().toString());
+ inventoryCheckOrder.setCreateBy(getUserId());
inventoryCheckOrder.setCreateTime(new Date());
inventoryCheckOrder.setStatus("1");
@@ -150,10 +162,10 @@
return R.ok(orderNo + "鏂板鎴愬姛");
}
- @RequestMapping(value = "/inventoryCheckOrder/update/auth")
- @ManagerAuth
- public R update(InventoryCheckOrder inventoryCheckOrder){
- if (Cools.isEmpty(inventoryCheckOrder) || null==inventoryCheckOrder.getId()){
+ @RequestMapping(value = "/inventoryCheckOrder/update/auth")
+ @ManagerAuth
+ public R update(InventoryCheckOrder inventoryCheckOrder) {
+ if (Cools.isEmpty(inventoryCheckOrder) || null == inventoryCheckOrder.getId()) {
return R.error();
}
inventoryCheckOrderService.updateById(inventoryCheckOrder);
@@ -162,8 +174,8 @@
@RequestMapping(value = "/inventoryCheckOrder/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
inventoryCheckOrderService.deleteById(id);
}
return R.ok();
@@ -171,7 +183,7 @@
@RequestMapping(value = "/inventoryCheckOrder/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<InventoryCheckOrder> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("inventoryCheckOrder"));
@@ -187,7 +199,7 @@
wrapper.like("id", condition);
Page<InventoryCheckOrder> page = inventoryCheckOrderService.selectPage(new Page<>(0, 1000), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (InventoryCheckOrder inventoryCheckOrder : page.getRecords()){
+ for (InventoryCheckOrder inventoryCheckOrder : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", inventoryCheckOrder.getId());
map.put("value", inventoryCheckOrder.getId());
@@ -200,7 +212,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<InventoryCheckOrder> wrapper = new EntityWrapper<InventoryCheckOrder>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != inventoryCheckOrderService.selectOne(wrapper)){
+ if (null != inventoryCheckOrderService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(InventoryCheckOrder.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/entity/InventoryCheckOrder.java b/src/main/java/com/zy/asrs/entity/InventoryCheckOrder.java
index bff935b..8960248 100644
--- a/src/main/java/com/zy/asrs/entity/InventoryCheckOrder.java
+++ b/src/main/java/com/zy/asrs/entity/InventoryCheckOrder.java
@@ -54,11 +54,11 @@
*/
@ApiModelProperty(value= "鍒涘缓浜�")
@TableField("create_by")
- private String createBy;
+ private Long createBy;
public InventoryCheckOrder() {}
- public InventoryCheckOrder(Integer id,String orderNo,String area,Date createTime,String createBy) {
+ public InventoryCheckOrder(Integer id,String orderNo,String area,Date createTime,Long createBy) {
this.id = id;
this.orderNo = orderNo;
this.area = area;
diff --git a/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java b/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java
index 2961436..d59b78b 100644
--- a/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java
@@ -1,16 +1,17 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("man_Inventory_check_order_detl")
@@ -18,48 +19,49 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("order_no")
private String orderNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String matnr;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String maktx;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String batch;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private Double anfme;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String area;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String status;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("loc_no")
private String locNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("check_anfme")
private Double checkAnfme;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("io_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date ioTime;
- public InventoryCheckOrderDetl() {}
+ public InventoryCheckOrderDetl() {
+ }
- public InventoryCheckOrderDetl(String orderNo,String matnr,String maktx,String batch,Double anfme,String area,String locNo,Date ioTime) {
+ public InventoryCheckOrderDetl(String orderNo, String matnr, String maktx, String batch, Double anfme, String area, String locNo, Date ioTime) {
this.orderNo = orderNo;
this.matnr = matnr;
this.maktx = maktx;
@@ -81,18 +83,18 @@
// null //
// );
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getStatus$(){
- if (Cools.isEmpty(this.status)){
- return "";
+ public String getStatus$() {
+ if (Cools.isEmpty(this.status)) {
+ return "寰呯洏";
}
- switch (this.status){
+ switch (this.status) {
case "1":
return "寰呯洏";
case "2":
@@ -102,18 +104,18 @@
}
}
- public String getProfit$(){
- if (Cools.isEmpty(this.status) && !this.status.equals("1")){
+ public String getProfit$() {
+ if (Cools.isEmpty(this.status) || !this.status.equals("1")) {
return "鏈洏鐐�";
}
- if (Cools.isEmpty(this.anfme) || Cools.isEmpty(this.checkAnfme)){
+ if (Cools.isEmpty(this.anfme) || Cools.isEmpty(this.checkAnfme)) {
return "";
}
- if (this.anfme > this.checkAnfme){
+ if (this.anfme > this.checkAnfme) {
return "鐩樹簭";
- }else if (this.anfme < this.checkAnfme){
+ } else if (this.anfme < this.checkAnfme) {
return "鐩樼泩";
- }else {
+ } else {
return "骞�";
}
}
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 9e2dfdf..baa0a71 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -15,6 +15,9 @@
// 鍑虹珯鍙�
private Integer outSite;
+ //
+ private String checkId;
+
// 鐗╂枡缂栧彿闆嗗悎
private List<LocDetl> locDetls;
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index 6957b76..0ebeebc 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -38,7 +38,7 @@
* @param locDetls 寰呭嚭搴撶墿鏂�
* @param ioType 鍏ュ嚭搴撶被鍨�
*/
- void stockOut(BasDevp staNo, List<LocDetlDto> locDetls, IoWorkType ioWorkType, Long userId);
+ void stockOut(BasDevp staNo, List<LocDetlDto> locDetls, IoWorkType ioWorkType, Long userId,String checkOrderNo);
void stockOut(BasDevp staNo, TaskDto taskDto, Long userId);
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 4a14836..ee6392b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -76,6 +76,12 @@
private ManLocDetlMapper manLocDetlMapper;
@Autowired
+ private InventoryCheckOrderService inventoryCheckOrderService;
+
+ @Autowired
+ private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
+
+ @Autowired
private AdjDetlService adjDetlService;
@Resource
@@ -597,6 +603,7 @@
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
+ waitPakin.setWeight(detlDto.getWeight());
waitPakin.setBatch(detlDto.getBatch());
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
@@ -786,6 +793,9 @@
throw new CoolException(wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�" + wrkDetl.getBatch() + "鎵瑰彿淇敼鏁伴噺澶辫触");
}
}
+ //濡傛灉宸茬粡鎷ｆ枡鍥炲簱锛屽氨闇�瑕佸彇locNo瀛楁
+// String locNo =Cools.isEmpty(wrkMast.getLocNo())? wrkMast.getSourceLocNo():wrkMast.getLocNo();
+// inventoryCheckOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>().eq("loc_no",locNo))
iterator.remove();
iterator1.remove();
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index c160f94..57158ed 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -94,6 +94,12 @@
@Resource
private OrderPakoutService orderPakOutService;
+ @Autowired
+ private InventoryCheckOrderService checkOrderService;
+
+ @Autowired
+ private InventoryCheckOrderDetlService checkOrderDetlService;
+
@Override
@Transactional
public String startupFullPutStore(FullStoreParam param, Long userId) {
@@ -199,7 +205,7 @@
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D")) {
// 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
- stockOut(staNo, locDetlDtos, null, userId);
+ stockOut(staNo, locDetlDtos, null, userId, null);
} else {
throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篎銆丏鐨勫簱浣嶏紝搴撲綅鍙凤細" + locMast.getLocNo() + " 銆佸綋鍓嶇姸鎬侊細" + locMast.getLocSts() + "-" + locMast.getLocSts$());
}
@@ -288,7 +294,7 @@
@Override
@Transactional
- public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId) {
+ public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId, String checkOrderNo) {
Date now = new Date();
// 鍚堝苟鍚岀被椤�
Set<String> locNos = new HashSet<>();
@@ -315,6 +321,15 @@
ioType = dto.isAll() ? 101 : 103;
} else if (ioWorkType.equals(IoWorkType.CHECK_OUT)) {
ioType = 107;
+ if (Cools.isEmpty(checkOrderNo)) {
+ checkOrderNo = DateUtils.createTimeStamp();
+ InventoryCheckOrder checkOrder = new InventoryCheckOrder();
+ checkOrder.setCreateBy(userId);
+ checkOrder.setStatus("1");
+ checkOrder.setCreateTime(new Date());
+ checkOrder.setOrderNo(checkOrderNo);
+ checkOrderService.insert(checkOrder);
+ }
}
assert ioType != null;
// 鑾峰彇搴撲綅
@@ -372,6 +387,17 @@
wrkDetl.setModiUser(userId);
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
+ if (ioType == 107) {
+ InventoryCheckOrderDetl checkOrderDetl = new InventoryCheckOrderDetl();
+ checkOrderDetl.setOrderNo(checkOrderNo);
+ checkOrderDetl.setMatnr(detlDto.getLocDetl().getMatnr());
+ checkOrderDetl.setMaktx(detlDto.getLocDetl().getMaktx());
+ checkOrderDetl.setBatch(detlDto.getLocDetl().getBatch());
+ checkOrderDetl.setLocNo(detlDto.getLocDetl().getLocNo());
+ checkOrderDetl.setAnfme(detlDto.getLocDetl().getAnfme());
+ checkOrderDetl.setStatus("0");
+ checkOrderDetlService.insert(checkOrderDetl);
}
}
// 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
@@ -705,7 +731,7 @@
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
if (locMast.getLocSts().equals("F")) {
// 鍚姩鍑哄簱寮�濮� 107.鐩樼偣鍑哄簱
- stockOut(staNo, locDetlDtos, IoWorkType.CHECK_OUT, userId);
+ stockOut(staNo, locDetlDtos, IoWorkType.CHECK_OUT, userId, param.getCheckId());
} else {
throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篎鐨勫簱浣嶏紝搴撲綅鍙凤細" + locMast.getLocNo() + " 銆佸綋鍓嶇姸鎬侊細" + locMast.getLocSts() + "-" + locMast.getLocSts$());
}
@@ -1408,7 +1434,9 @@
//// stockOutRe(wrkMast, wrkDetls);
// }
// }
-
+ if (wrkMast.getIoType() == 107) {
+ checkOrderDetlService.delete(new EntityWrapper<InventoryCheckOrderDetl>().eq("loc_no", locNo));
+ }
// 鍙栨秷鎿嶄綔浜哄憳璁板綍
wrkMast.setManuType("鎵嬪姩鍙栨秷");
wrkMast.setModiUser(userId);
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 92f2386..cefe972 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -248,6 +248,8 @@
locMast.setLocSts("F");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
+ //鏍囪璇ュ簱浣嶅凡缁忔嫞鏂欒繃
+ locMast.setPdcType("pick");
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -331,19 +333,19 @@
return FAIL.setMsg("鐩樼偣鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
for (WrkDetl wrkDetl : wrkDetls57) {
- if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
- // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
- if (!Cools.isEmpty(orderDetlPakout)) {
-// if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
-// orderDetlPakout.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
-// wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
- if (!orderDetlPakoutService.increaseQtyByOrderNo(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getBrand(), orderDetlPakout.getStandby1(), orderDetlPakout.getStandby2(), orderDetlPakout.getStandby3(), orderDetlPakout.getBoxType1(), orderDetlPakout.getBoxType2(), orderDetlPakout.getBoxType3(), wrkDetl.getAnfme())) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鐩樼偣鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
- }
- }
- }
+// if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
+// // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
+// OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+// if (!Cools.isEmpty(orderDetlPakout)) {
+//// if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
+//// orderDetlPakout.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+//// wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
+// if (!orderDetlPakoutService.increaseQtyByOrderNo(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getBrand(), orderDetlPakout.getStandby1(), orderDetlPakout.getStandby2(), orderDetlPakout.getStandby3(), orderDetlPakout.getBoxType1(), orderDetlPakout.getBoxType2(), orderDetlPakout.getBoxType3(), wrkDetl.getAnfme())) {
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// return FAIL.setMsg("鐩樼偣鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
+// }
+// }
+// }
}
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 741ac49..41b126b 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -170,15 +170,15 @@
FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(waitPakins.get(0));
//TODO 娴嬭瘯
- StartupDto dto = new StartupDto();
- dto.setCrnNo(1);
- dto.setSourceStaNo(devpNo);
- dto.setStaNo(103);
- LocMast locMastxx = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "O"));
- dto.setLocNo(locMastxx.getLocNo());
- dto.setWorkNo(Integer.parseInt(Math.random() * 1000 + ""));
+// StartupDto dto = new StartupDto();
+// dto.setCrnNo(1);
+// dto.setSourceStaNo(devpNo);
+// dto.setStaNo(103);
+// LocMast locMastxx = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "O"));
+// dto.setLocNo(locMastxx.getLocNo());
+// dto.setWorkNo(Integer.parseInt(Math.random() * 1000 + ""));
- //StartupDto dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto);
+ StartupDto dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto);
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
diff --git a/src/main/java/com/zy/nc/task/PlanOrderTask.java b/src/main/java/com/zy/nc/task/PlanOrderTask.java
index f874839..dd0f29b 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -183,20 +183,20 @@
*
* @return
*/
- @Scheduled(cron = "0/3 * * * * ? ")
- public void execute4() {
- List<String> strings = nccCkPddWmsService.selectPdd();
- for (String string : strings) {
- List<NccCkPddWms> wmsFlag = nccCkPddWmsService.selectList(new EntityWrapper<NccCkPddWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("FBILLFLAG", 4).eq("hdr", 0).eq("bdr", 0));
- ReturnT<String> returnT = planOrderHandler.start4(wmsFlag);
- if (!returnT.isSuccess()) {
- for (NccCkPddWms wms : wmsFlag) {
- wms.setWmsMemo(returnT.getMsg());
- wms.setWmsFlag(0);
- nccCkPddWmsService.updateById(wms);
- }
- log.error(returnT.getMsg());
- }
- }
- }
+// @Scheduled(cron = "0/3 * * * * ? ")
+// public void execute4() {
+// List<String> strings = nccCkPddWmsService.selectPdd();
+// for (String string : strings) {
+// List<NccCkPddWms> wmsFlag = nccCkPddWmsService.selectList(new EntityWrapper<NccCkPddWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("FBILLFLAG", 4).eq("hdr", 0).eq("bdr", 0));
+// ReturnT<String> returnT = planOrderHandler.start4(wmsFlag);
+// if (!returnT.isSuccess()) {
+// for (NccCkPddWms wms : wmsFlag) {
+// wms.setWmsMemo(returnT.getMsg());
+// wms.setWmsFlag(0);
+// nccCkPddWmsService.updateById(wms);
+// }
+// log.error(returnT.getMsg());
+// }
+// }
+// }
}
diff --git a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
index 9fbf7c8..a16da33 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -270,40 +270,40 @@
*
* @return
*/
- @Transactional
- public ReturnT<String> start4(List<NccCkPddWms> wmsFlag) {
- try {
- InventoryCheckOrder param = new InventoryCheckOrder();
- InventoryCheckOrderDetl checkOrderDetl = null;
- for (NccCkPddWms nccScZkmxbWms : wmsFlag) {
- log.info("NccCkPddWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
- Mat mat = matService.selectByMatnr(nccScZkmxbWms.getWlbm());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(nccScZkmxbWms.getWlbm() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
- checkOrderDetl = new InventoryCheckOrderDetl();
- checkOrderDetl.setMatnr(nccScZkmxbWms.getWlbm());
- checkOrderDetl.setMaktx(mat.getMaktx());
- checkOrderDetl.setOrderNo(nccScZkmxbWms.getVbillcode());
- checkOrderDetl.setAnfme(nccScZkmxbWms.getZmzsl().doubleValue());
- checkOrderDetl.setBatch(nccScZkmxbWms.getVbatchcode());
- inventoryCheckOrderDetlService.insert(checkOrderDetl);
- nccScZkmxbWms.setWmsFlag(1);
- param.setOrderNo(nccScZkmxbWms.getVbillcode());
- param.setCreateBy(nccScZkmxbWms.getPdrmc());
-
- }
- param.setCreateTime(new Date());
- param.setStatus("1");
- inventoryCheckOrderService.insert(param);
- nccCkPddWmsService.updateBatchById(wmsFlag);
- } catch (Exception e) {
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- }
- return SUCCESS;
- }
+// @Transactional
+// public ReturnT<String> start4(List<NccCkPddWms> wmsFlag) {
+// try {
+// InventoryCheckOrder param = new InventoryCheckOrder();
+// InventoryCheckOrderDetl checkOrderDetl = null;
+// for (NccCkPddWms nccScZkmxbWms : wmsFlag) {
+// log.info("NccCkPddWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
+// Mat mat = matService.selectByMatnr(nccScZkmxbWms.getWlbm());
+// if (Cools.isEmpty(mat)) {
+// throw new CoolException(nccScZkmxbWms.getWlbm() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+// }
+// checkOrderDetl = new InventoryCheckOrderDetl();
+// checkOrderDetl.setMatnr(nccScZkmxbWms.getWlbm());
+// checkOrderDetl.setMaktx(mat.getMaktx());
+// checkOrderDetl.setOrderNo(nccScZkmxbWms.getVbillcode());
+// checkOrderDetl.setAnfme(nccScZkmxbWms.getZmzsl().doubleValue());
+// checkOrderDetl.setBatch(nccScZkmxbWms.getVbatchcode());
+// inventoryCheckOrderDetlService.insert(checkOrderDetl);
+// nccScZkmxbWms.setWmsFlag(1);
+// param.setOrderNo(nccScZkmxbWms.getVbillcode());
+// param.setCreateBy(nccScZkmxbWms.getPdrmc());
+//
+// }
+// param.setCreateTime(new Date());
+// param.setStatus("1");
+// inventoryCheckOrderService.insert(param);
+// nccCkPddWmsService.updateBatchById(wmsFlag);
+// } catch (Exception e) {
+// e.printStackTrace();
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// return FAIL.setMsg(e.getMessage());
+// }
+// return SUCCESS;
+// }
/**
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index b0b18db..224d49c 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -201,7 +201,7 @@
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
+ //,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
@@ -227,6 +227,7 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '鎵规'}
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
+ ,{field: 'weight', align: 'center',title: '杈呮暟閲�'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
,{field: 'specs', align: 'center',title: '瑙勬牸', hide: false}
,{field: 'model', align: 'center',title: '鍨嬪彿'}
@@ -244,7 +245,6 @@
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '杈呮暟閲�'}
,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
diff --git a/src/main/webapp/static/js/pakStore/locCheckOut.js b/src/main/webapp/static/js/pakStore/locCheckOut.js
index d2e5b58..061aca1 100644
--- a/src/main/webapp/static/js/pakStore/locCheckOut.js
+++ b/src/main/webapp/static/js/pakStore/locCheckOut.js
@@ -32,6 +32,7 @@
tableMerge.render(this);
limit();
getOutBound();
+ getCheckOrder();
}
});
@@ -43,12 +44,14 @@
layer.msg('璇峰厛娣诲姞鐩樼偣搴撳瓨', {icon: 2});
} else {
var staNo = $("#staNoSelect").val();
+ var checkId = $("#checkIdSelect").val();
if (staNo === "" || staNo === null){
layer.msg("璇烽�夋嫨鐩樼偣绔�", {icon: 2});
return;
}
let param = {
outSite: staNo,
+ checkId: checkId,
locDetls: locDetlData
}
$.ajax({
@@ -97,6 +100,30 @@
})
}
+
+ // 鑾峰彇鐩樼偣鍗�
+ function getCheckOrder(){
+ $.ajax({
+ url: baseUrl+"/inventoryCheckOrder/nav/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ var tpl = $("#takeCheckSelectTemplate").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#checkIdSelect').append(html);
+ form.render('select');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+
$(document).on('click','#mat-query', function () {
let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
locDetlLayerIdx = layer.open({
diff --git a/src/main/webapp/views/inventoryCheckOrder/inventoryCheckOrder.html b/src/main/webapp/views/inventoryCheckOrder/inventoryCheckOrder.html
index 5eb829d..3045e67 100644
--- a/src/main/webapp/views/inventoryCheckOrder/inventoryCheckOrder.html
+++ b/src/main/webapp/views/inventoryCheckOrder/inventoryCheckOrder.html
@@ -151,9 +151,9 @@
<!-- </div>-->
<!-- <button class="layui-btn layui-btn-sm layui-btn-danger btn-pakoutPreview" id="btn-pakoutPreview" lay-event="submitERP"><i class="layui-icon"></i>鎻愪氦ERP</button>-->
<button id="submitERP" class="layui-btn icon-btn btn-add" lay-event="submitERP"><i class="layui-icon"></i>鎻愪氦ERP</button>
- <button id="showFormBtn" class="layui-btn icon-btn" lay-submit>
- <i class="layui-icon"></i>娣诲姞鍗曟嵁
- </button>
+<!-- <button id="showFormBtn" class="layui-btn icon-btn" lay-submit>-->
+<!-- <i class="layui-icon"></i>娣诲姞鍗曟嵁-->
+<!-- </button>-->
</script>
<!-- 琛屽伐鍏锋爮 -->
diff --git a/src/main/webapp/views/pakStore/locCheckOut.html b/src/main/webapp/views/pakStore/locCheckOut.html
index 393dfba..4b3b20b 100644
--- a/src/main/webapp/views/pakStore/locCheckOut.html
+++ b/src/main/webapp/views/pakStore/locCheckOut.html
@@ -100,6 +100,12 @@
<select id="staNoSelect" lay-verify="required">
<option value="">璇烽�夋嫨绔欑偣</option>
</select>
+
+ <!-- 1.閫夋嫨鐩樼偣鍗� -->
+ <span id="checkId">鐩樼偣鍗曪細</span>
+ <select id="checkIdSelect" lay-verify="required">
+ <option value="">璇烽�夋嫨鐩樼偣鍗�</option>
+ </select>
<!-- 2.鍚姩鍑哄簱 -->
<button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outbound">鐩樼偣鍑哄簱</button>
</div>
@@ -120,6 +126,12 @@
{{/each}}
</script>
+<script type="text/template" id="takeCheckSelectTemplate">
+ {{#each data}}
+ <option value="{{this}}">{{this}}</option>
+ {{/each}}
+</script>
+
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
--
Gitblit v1.9.1