From 0cc7b985d6a1c89addcc281de884f25050e27bd7 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 27 六月 2024 13:30:36 +0800
Subject: [PATCH] # bom档案
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 4
src/main/webapp/static/image/logo2.png | 0
src/main/java/com/zy/asrs/entity/param/CombParam.java | 3
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 1
src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java | 2
src/main/java/com/zy/asrs/service/LocDetlService.java | 2
src/main/resources/mapper/WaitPakinMapper.xml | 1
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 5
src/main/resources/mapper/LocDetlMapper.xml | 7 +
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 5
src/main/java/com/zy/asrs/controller/MobileController.java | 42 +++++++
src/main/resources/mapper/WrkDetlMapper.xml | 8 +
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 4
src/main/java/com/zy/asrs/entity/param/CheckBom.java | 12 ++
src/main/java/com/zy/asrs/entity/WaitPakin.java | 4
src/main/java/com/zy/asrs/entity/LocDetl.java | 4
src/main/webapp/static/image/logo1.png | 0
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 1
src/main/webapp/views/index.html | 2
src/main/java/com/zy/asrs/entity/WrkDetl.java | 4
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 176 +++++++++++++++++++++++++++++
src/main/webapp/views/login.html | 6
src/main/java/com/zy/asrs/service/MobileService.java | 11 +
src/main/java/com/zy/asrs/service/WrkDetlService.java | 2
24 files changed, 301 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 00dff10..630bdd7 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -59,6 +59,8 @@
private CommonService commonService;
@Autowired
private MatService matService;
+ @Autowired
+ private BomMatService bomMatService;
// 鍟嗗搧涓婃灦
@RequestMapping("/mat/onSale/auth")
@@ -111,6 +113,46 @@
return R.ok("缁勬墭鎴愬姛");
}
+ @RequestMapping("/comb/auth2")
+ @ManagerAuth(memo = "缁勬墭")
+ public R comb2(@RequestBody CombParam combParam){
+ mobileService.comb2(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
+ @RequestMapping("/comb/checkBom")
+ @ManagerAuth(memo = "鏍￠獙Bom")
+ public R checkBom(@RequestBody CheckBom checkBom){
+ BomMat bomMat = new BomMat();
+ // 娌℃湁杈撳叆bom鍙锋甯哥粍鎵�
+ if (Cools.isEmpty(checkBom.getBomCode())) {
+ return R.ok();
+ }
+
+ if (Cools.isEmpty(checkBom.getMatnr())) {
+ return R.ok().add(bomMat);
+ } else {
+ // 妫�鏌ユ槸鍚﹀湪bom娓呭崟鍐�
+ bomMat = bomMatService.selectOne(new EntityWrapper<BomMat>().eq("unit_num", checkBom.getBomCode()).eq("element_num", checkBom.getMatnr()));
+ if (Cools.isEmpty(bomMat)) {
+ throw new CoolException("褰撳墠鐗╂枡" + checkBom.getMatnr() + "涓嶅湪Bom娓呭崟鍐�");
+ } else {
+ // 妫�鏌ュ簱瀛樹腑鏄惁鏈夊綋鍓峛om鐨勭墿鏂�
+ Double bomQyt = locDetlService.getBomQyt(checkBom.getBomCode(), checkBom.getMatnr());
+ if (!Cools.isEmpty(bomQyt)) {
+ bomMat.setZpalletAnfme(bomMat.getZpalletAnfme() - bomQyt);
+ }
+ Double bomQty = wrkDetlService.getBomQty(checkBom.getBomCode(), checkBom.getMatnr());
+ if (!Cools.isEmpty(bomQty)) {
+ bomMat.setZpalletAnfme(bomMat.getZpalletAnfme() - bomQty);
+ }
+ // 妫�鏌ュ伐浣滄。涓槸鍚︽湁褰撳墠bom鐨勭墿鏂�
+
+ }
+ }
+ return R.ok().add(bomMat);
+ }
+
@RequestMapping("/pack/get/auth")
@ManagerAuth
public R packGet(@RequestParam String barcode){
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 333ccc0..6ded1d8 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -158,6 +158,10 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "bom鍙�")
+ @TableField("bom_code")
+ private String bomCode;
+
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/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 11608f6..35bef45 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -160,6 +160,10 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "bom鍙�")
+ @TableField("bom_code")
+ private String bomCode;
+
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 8909bc8..94d795b 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -152,6 +152,10 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "bom鍙�")
+ @TableField("bom_code")
+ private String bomCode;
+
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 5978fdc..02f3d1f 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -270,6 +270,10 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "bom鍙�")
+ @TableField("bom_code")
+ private String bomCode;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index b4e7076..c6c4521 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -271,6 +271,10 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "bom鍙�")
+ @TableField("bom_code")
+ private String bomCode;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/entity/param/CheckBom.java b/src/main/java/com/zy/asrs/entity/param/CheckBom.java
new file mode 100644
index 0000000..853fd9f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/CheckBom.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class CheckBom {
+ // bom鍙�
+ private String bomCode;
+
+ // 鐗╂枡鍙�
+ private String matnr;
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index d8e1ed8..4a1f2da 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -10,6 +10,9 @@
@Data
public class CombParam {
+ // bom鍙�
+ private String bomCode;
+
// 鍗曟嵁缂栧彿
private String orderNo;
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index c33ab13..350c5de 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -67,4 +67,5 @@
Double selectLocDetlSumQty(String locNo);
+ Double getBomQyt(String bomCode,String matnr);
}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
index 97d48d8..e94b8a6 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
@@ -23,4 +23,6 @@
int updateInspect( @Param("wrkNo")Integer wrkNo, @Param("matnr")String matnr, @Param("batch")String batch);
List<WrkDetl> selectPakoutQuery(@Param("staNo")Integer staNo, @Param("matnr")String matnr);
+
+ Double getBomQty(String bomCode,String matnr);
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 0023ecf..1ff1079 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -55,4 +55,6 @@
List<LocDetl> unreason();
Double getLocDetlSumQty(String locNo);
+
+ Double getBomQyt(String bomCode,String matnr);
}
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index c1cd82b..6b219d3 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -5,6 +5,7 @@
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.param.CheckBom;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OffSaleParam;
@@ -19,6 +20,16 @@
void comb(CombParam param, Long userId);
/**
+ * 缁勬墭
+ */
+ void comb2(CombParam param, Long userId);
+
+ /**
+ * 鏍￠獙bom
+ */
+ R checkBom(CheckBom param, Long userId);
+
+ /**
* 涓婃灦
*/
void onSale(CombParam param);
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlService.java b/src/main/java/com/zy/asrs/service/WrkDetlService.java
index 5d7d283..5920849 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlService.java
@@ -23,4 +23,6 @@
List<WrkDetl> selectPakoutQuery(Integer staNo, String matnr);
+ Double getBomQty(String bomCode,String matnr);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 44bdd07..d8374e3 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -116,4 +116,9 @@
public Double getLocDetlSumQty(String locNo) {
return this.baseMapper.selectLocDetlSumQty(locNo);
}
+
+ @Override
+ public Double getBomQyt(String bomCode,String matnr) {
+ return this.baseMapper.getBomQyt(bomCode,matnr);
+ }
}
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 81b0926..9248666 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -10,6 +10,7 @@
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.CheckBom;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OffSaleParam;
@@ -78,6 +79,9 @@
private DocTypeService docTypeService;
@Autowired
private MatV2Service matV2Service;
+ @Autowired
+ private BomMatService bomMatService;
+
@Override
@Transactional
public void comb(CombParam param, Long userId) {
@@ -220,6 +224,178 @@
}
+ @Override
+ @Transactional
+ public void comb2(CombParam param, Long userId) {
+
+ if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ if(param.getCombMats().stream().anyMatch(obj -> obj.getAnfme() == null)){
+ throw new CoolException("鍏ュ簱鐗╂枡鏁伴噺涓嶈兘涓虹┖");
+ }
+ // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+ eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+ throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+ }
+
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+ if (wrkMast != null && wrkMast.getIoType() < 100){
+ throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+
+ }
+ if (countLoc > 0 ) {
+ throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+ }
+
+
+ //璁剧疆闈瀗ull鎵瑰彿锛�
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ if (combMat.getBatch() == null){
+ combMat.setBatch("");
+ }
+ }
+
+
+
+
+ Date now = new Date();
+
+ // 鏃犲崟缁勬墭
+ if (Cools.isEmpty(param.getCombMats().get(0).getOrderNo())) {
+
+ // 鐢熸垚鍏ュ簱閫氱煡妗�
+ List<DetlDto> detlDtos = new ArrayList<>();
+ param.getCombMats().forEach(elem -> {
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
+ if (DetlDto.has(detlDtos, detlDto)) {
+ DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
+ assert one != null;
+ one.setAnfme(one.getAnfme() + detlDto.getAnfme());
+ } else {
+ detlDtos.add(detlDto);
+ }
+ });
+
+
+ for (DetlDto detlDto : detlDtos) {
+ Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ WaitPakin waitPakin = new WaitPakin();
+ if (Cools.isEmpty(mat)) {
+ MatV2 matV2 = matV2Service.selectOne(new EntityWrapper<MatV2>().eq("matnr", detlDto.getMatnr()));
+ if(Cools.isEmpty(matV2)){
+ throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+ waitPakin.sync(matV2);
+ waitPakin.setBrand("缁勪欢");
+ } else {
+ waitPakin.sync(mat);
+ }
+ // 鏍￠獙鏄惁涓篵om鍏ュ簱 bom鍏ュ簱鐨勬暟閲忎笉鑳借秴杩囧簱瀛樺師鏈夋暟閲�
+ if (!Cools.isEmpty(param.getBomCode())) {
+ BomMat bomMat = bomMatService.selectOne(new EntityWrapper<BomMat>().eq("unit_num", param.getBomCode()).eq("element_num", detlDto.getMatnr()));
+ Double bomQyt = locDetlService.getBomQyt(param.getBomCode(), detlDto.getMatnr());
+ if (!Cools.isEmpty(bomQyt)) {
+ bomMat.setZpalletAnfme(bomMat.getZpalletAnfme() - bomQyt);
+ }
+ Double bomQty = wrkDetlService.getBomQty(param.getBomCode(), detlDto.getMatnr());
+ if (!Cools.isEmpty(bomQty)) {
+ bomMat.setZpalletAnfme(bomMat.getZpalletAnfme() - bomQty);
+ }
+ if (bomMat.getZpalletAnfme() == 0.0D) {
+ throw new CoolException(detlDto.getMatnr() + "褰撳墠鐗╂枡宸插叆鏈�澶ф暟閲�");
+ } else {
+ if (bomMat.getZpalletAnfme() < detlDto.getAnfme()) {
+ throw new CoolException(detlDto.getMatnr() + "褰撳墠鐗╂枡鏈�澶氬彲鍏�" + bomMat.getZpalletAnfme() + "浠�");
+ }
+ }
+ }
+ waitPakin.setBatch(detlDto.getBatch());
+ waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+ waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
+ waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setAppeUser(userId);
+ waitPakin.setBomCode(param.getBomCode());
+ waitPakin.setAppeTime(now);
+ waitPakin.setModiUser(userId);
+ waitPakin.setModiTime(now);
+ if (!waitPakinService.insert(waitPakin)) {
+ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ }
+ // 鍏宠仈缁勬墭
+ } else {
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ // 鐢熸垚鍏ュ簱閫氱煡妗�
+ Order order = orderService.selectByNo(combMat.getOrderNo());
+
+ //鍒ゆ柇璁㈠崟绫诲瀷鏄惁鏄叆搴�
+ DocType docType=docTypeService.selectById(order.getDocType());
+ if(docType.getPakin()!=1 || docType.getStatus()!=1){
+ throw new CoolException("璁㈠崟涓哄嚭搴撹鍗曪紝涓嶈兘缁勬墭锛�");
+ }
+
+ if (order.getSettle() > 2) {
+ throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
+ }
+ OrderDetl orderDetl = orderDetlService.selectItem(combMat.getOrderNo(), combMat.getMatnr(), combMat.getBatch());
+ if (orderDetl == null) {
+ throw new CoolException("鎵句笉鍒扮粍鎵樼殑鍗曟嵁鏄庣粏");
+ }
+ //璁㈠崟鏁�-宸ヤ綔涓殑鏁伴噺-缁勬墭鏁伴噺
+ if ( orderDetl.getAnfme() - orderDetl.getWorkQty() - combMat.getAnfme()<0) {
+ throw new CoolException("缁勬墭鏁伴噺宸茶秴鍑鸿鍗曢渶姹傞噺锛岃妫�鏌ユ槸鍚︽湁鍏朵粬鐨勭粍鎵樺凡瀹屾垚");
+ }
+ // 淇敼璁㈠崟浣滀笟鏁伴噺
+ if (!orderDetlService.increaseWorkQty(order.getId(), combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+ }
+ Mat mat = matService.selectByMatnr(combMat.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(combMat.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+ WaitPakin waitPakin = new WaitPakin();
+ waitPakin.sync(mat);
+ waitPakin.setOrderNo(order.getOrderNo()); // 鍗曟嵁缂栧彿
+ waitPakin.setBatch(combMat.getBatch()); // 搴忓垪鐮�
+ waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+ waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(combMat.getAnfme()); // 鏁伴噺
+ waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setAppeUser(userId);
+ waitPakin.setAppeTime(now);
+ waitPakin.setBomCode(param.getBomCode());
+ waitPakin.setModiUser(userId);
+ waitPakin.setModiTime(now);
+ if (!waitPakinService.insert(waitPakin)) {
+ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+
+// DetlDto detlDto = new DetlDto(combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme());
+// if (DetlDto.has(detlDtos, detlDto)) {
+// DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
+// assert one != null;
+// one.setAnfme(one.getAnfme() + detlDto.getAnfme());
+// } else {
+// }
+ orderService.updateSettle(order.getId(), 2L, userId);
+ }
+
+ }
+
+ }
+
+ @Override
+ @Transactional
+ public R checkBom(CheckBom param, Long userId) {
+
+
+ return R.ok();
+ }
+
// 鍟嗗搧涓婃灦
@Override
public void onSale(CombParam param) {
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 87e7d6e..c804b6c 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -835,7 +835,6 @@
locDetl.sync(mat);
locDetl.setZpallet(zpallet);
locDetl.setBatch(adjust.getBatch());
- locDetl.setBarcode(locDetls.get(0).getBarcode());
locDetl.setLocNo(locMast.getLocNo());
locDetl.setAnfme(adjust.getCount()); // 鏁伴噺
locDetl.setModiUser(userId); // 鎿嶄綔浜哄憳淇℃伅
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 2f8b862..b542e65 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -111,4 +111,9 @@
public List<WrkDetl> selectPakoutQuery(Integer staNo, String matnr) {
return this.baseMapper.selectPakoutQuery(staNo, matnr);
}
+
+ @Override
+ public Double getBomQty(String bomCode,String matnr) {
+ return this.baseMapper.getBomQty(bomCode,matnr);
+ }
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index ffd2182..e88ab6f 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -327,5 +327,12 @@
where loc_no=#{locNo}
</select>
+ <select id="getBomQyt" resultType="double">
+ select SUM(anfme) anfme
+ from asr_loc_detl
+ where bom_code = #{bomCode}
+ and matnr = #{matnr}
+ </select>
+
</mapper>
diff --git a/src/main/resources/mapper/WaitPakinMapper.xml b/src/main/resources/mapper/WaitPakinMapper.xml
index e4227b7..f3e59d6 100644
--- a/src/main/resources/mapper/WaitPakinMapper.xml
+++ b/src/main/resources/mapper/WaitPakinMapper.xml
@@ -47,6 +47,7 @@
<result column="appe_time" property="appeTime" />
<result column="appe_user" property="appeUser" />
<result column="memo" property="memo" />
+ <result column="bom_code" property="bomCode" />
</resultMap>
</mapper>
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 225f31e..6b1c11b 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -45,6 +45,7 @@
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
<result column="memo" property="memo" />
+ <result column="bom_code" property="bomCode" />
</resultMap>
<sql id="batchSeq">
@@ -108,4 +109,11 @@
and awd.matnr + '-' + awd.batch = #{matnr}
</select>
+ <select id="getBomQty" resultType="double">
+ select SUM(anfme) anfme
+ from asr_wrk_detl
+ where bom_code = #{bomCode}
+ and matnr = #{matnr}
+ </select>
+
</mapper>
diff --git a/src/main/webapp/static/image/logo1.png b/src/main/webapp/static/image/logo1.png
new file mode 100644
index 0000000..71dd632
--- /dev/null
+++ b/src/main/webapp/static/image/logo1.png
Binary files differ
diff --git a/src/main/webapp/static/image/logo2.png b/src/main/webapp/static/image/logo2.png
new file mode 100644
index 0000000..231c97e
--- /dev/null
+++ b/src/main/webapp/static/image/logo2.png
Binary files differ
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index e3ce393..9340c60 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -26,7 +26,7 @@
<!-- 澶撮儴 -->
<div class="layui-header">
<div class="layui-logo">
- <img src="../static/image/logo.png" style="display: inline-block; width: 40%;height: auto">
+ <img src="../static/image/logo2.png" style="display: inline-block; width: 40%;height: auto">
<!-- <span style="margin-top: 0; letter-spacing: 10px">涓壃绔嬪簱</span>-->
<!-- <img src="../static/image/logo.svg"/>-->
<!-- <cite>涓壃 - Zoneyung</cite>-->
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index b4c209b..3980123 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -53,7 +53,7 @@
z-index: 100;
top: 22px;
left: 20px;">
- <img src="../static/image/logo.png" alt="" style="width: 20%">
+ <img src="../static/image/logo2.png" alt="" style="width: 20%">
</div>
<div class="p-sketch-outline">
<h2 class="p-sketch-outline__title">Automatic Storage and Retrieval System</h2>
@@ -67,8 +67,8 @@
<div id="sidebar">
<div class="login-contain">
<div class="login-box">
- <img src="../static/image/logo.png" alt="" style="width: 80%">
- <span class="login100-form-title p-t-20 p-b-45">涓壃绔嬪簱</span>
+ <img src="../static/image/logo1.png" alt="" style="width: 80%">
+ <!--<span class="login100-form-title p-t-20 p-b-45">涓壃绔嬪簱</span>-->
<span class="login100-form-title p-t-20 p-b-45" style="margin: 15px 0;color: #868686;font-size: 24px">WMS</span>
<div class="wrap-input100 validate-input m-b-10" data-validate="璇疯緭鍏ョ敤鎴峰悕">
<input id="username" class="input100" type="text" name="username" placeholder="username" autocomplete="off">
--
Gitblit v1.9.1