From a869e7291b6016b297bc00b30a2e83f8ed3983ea Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期一, 14 二月 2022 08:28:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/PltBarcode.java | 79 ++++++++++++++++++++++---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 13 ++++
/dev/null | 0
src/main/webapp/static/js/pltBarcode/pltBarcode.js | 7 ++
src/main/resources/mapper/PltBarcodeMapper.xml | 4 +
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 16 ++++
src/main/resources/application.yml | 4
src/main/webapp/views/pda/matQuery.html | 20 ++++++
8 files changed, 126 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/PltBarcode.java b/src/main/java/com/zy/asrs/entity/PltBarcode.java
index 4481171..90b47bd 100644
--- a/src/main/java/com/zy/asrs/entity/PltBarcode.java
+++ b/src/main/java/com/zy/asrs/entity/PltBarcode.java
@@ -9,6 +9,7 @@
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -16,6 +17,7 @@
import java.util.Date;
@TableName("asr_plt_barcode")
+@Data
public class PltBarcode implements Serializable {
private static final long serialVersionUID = 1L;
@@ -71,6 +73,13 @@
private Double qty;
/**
+ * 鎬绘暟閲�
+ */
+ @ApiModelProperty(value= "鎬绘暟閲�")
+ @TableField("all_qty")
+ private Double allQty;
+
+ /**
* 搴撲綅鍙�
*/
@ApiModelProperty(value= "搴撲綅鍙�")
@@ -106,15 +115,36 @@
*/
@ApiModelProperty(value= "鍗曢噸")
private Double weight;
-
+ /**
+ * 鎬婚噸
+ */
+ @ApiModelProperty(value= "鎬婚噸閲�")
+ @TableField("all_weight")
+ private double allWeight;
+ /**
+ * 鏉ユ簮锛�1銆佸鍗� 2銆佽嚜鍒� 3銆佸渚�
+ */
+ @ApiModelProperty(value="鏉ユ簮锛�1銆佸鍗� 2銆佽嚜鍒� 3銆佸渚�")
+ private Integer source;
+ /**
+ * 渚涘簲鍟�
+ */
+ @ApiModelProperty(value = "鎵瑰彿")
+ private String supplier;
+ /**
+ * 渚涘簲鍟�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟�")
+ @TableField("batch_number")
+ private String batchNumber;
/**
* 澶囨敞
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
- @ApiModelProperty(value= "鎵瑰彿")
- private String supplier;
+// @ApiModelProperty(value= "鎵瑰彿")
+// private String supplier;
/**
* ERP杩炵嚎 0: 闈炶繛绾� 1: ERP杩炵嚎
@@ -170,7 +200,7 @@
public PltBarcode() {}
- public PltBarcode(String barcode,String billNo,Integer seqNo,Integer billType,String matNo,String matName,Double qty,String locNo,String specs,String unit,String size,String color,Double weight,String memo,Integer linkErp,Integer ioStatus,Date ioTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ public PltBarcode(String barcode,double allQty,Integer source,String supplier,String batchNumber,double allWeight,String billNo,Integer seqNo,Integer billType,String matNo,String matName,Double qty,String locNo,String specs,String unit,String size,String color,Double weight,String memo,Integer linkErp,Integer ioStatus,Date ioTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
this.barcode = barcode;
this.billNo = billNo;
this.seqNo = seqNo;
@@ -192,6 +222,11 @@
this.modiTime = modiTime;
this.appeUser = appeUser;
this.appeTime = appeTime;
+ this.allQty=allQty;
+ this.allWeight=allWeight;
+ this.source=source;
+ this.supplier=supplier;
+ this.batchNumber=batchNumber;
}
// PltBarcode pltBarcode = new PltBarcode(
@@ -226,6 +261,14 @@
this.barcode = barcode;
}
+ public double getAllWeight(){return allWeight;}
+
+ public void setAllWeight(double allweight){this.allWeight=allweight;}
+
+ public double getAllQty(){return allQty;}
+
+ public void setAllQty(double allqty){this.allQty=allqty;}
+
public String getBillNo() {
return billNo;
}
@@ -244,6 +287,20 @@
public Integer getBillType() {
return billType;
+ }
+
+ public String getSource$(){
+ if (null == this.source){ return null; }
+ switch (this.source){
+ case 1:
+ return "澶栧崗";
+ case 2:
+ return "鑷埗";
+ case 3:
+ return "瀹緵";
+ default:
+ return String.valueOf(this.source);
+ }
}
public String getBillType$(){
@@ -340,13 +397,13 @@
this.weight = weight;
}
- public String getSupplier() {
- return supplier;
- }
-
- public void setSupplier(String supplier) {
- this.supplier = supplier;
- }
+// public String getSupplier() {
+// return supplier;
+// }
+//
+// public void setSupplier(String supplier) {
+// this.supplier = supplier;
+// }
public String getMemo() {
return memo;
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 0b397b7..f2df93f 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -23,8 +23,11 @@
// 浜у搧鏁伴噺
private Double count;
-
+ //鎵瑰彿
private String supplier;
+
+ //鏉ユ簮
+ private Integer source;
private String memo;
@@ -36,6 +39,14 @@
this.seqNo = seqNo;
}
+ public Integer getSource() {
+ return source;
+ }
+
+ public void setSource(Integer source) {
+ this.source = source;
+ }
+
public String getMatNo() {
return matNo;
}
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 813c865..3977f57 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -18,6 +18,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
import java.util.Random;
/**
@@ -77,7 +78,7 @@
pltBarcode.setUnit(matCode.getUnit());
pltBarcode.setSpecs(matCode.getSpecs());
pltBarcode.setSize(matCode.getSize());
- pltBarcode.setSupplier(combMat.getSupplier());
+// pltBarcode.setSupplier(combMat.getSupplier());
pltBarcode.setMemo(combMat.getMemo());
pltBarcode.setColor(matCode.getColor());
pltBarcode.setLinkErp(0);
@@ -85,7 +86,17 @@
pltBarcode.setModiTime(now);
pltBarcode.setAppeUser(userId);
pltBarcode.setAppeTime(now);
-
+ if(matCode.getWeight()==null){
+ matCode.setWeight(0.0);
+ }
+ if(matCode.getStr6()==null){
+ matCode.setStr6(0.0);
+ pltBarcode.setAllQty(pltBarcode.getQty());
+ }else {
+ pltBarcode.setAllQty(matCode.getStr6()*pltBarcode.getQty());
+ }
+ pltBarcode.setWeight(matCode.getWeight());
+ pltBarcode.setAllWeight(matCode.getWeight()*pltBarcode.getQty()+30);
if (!pltBarcodeService.insert(pltBarcode)) {
throw new CoolException("淇濆瓨鏁版嵁澶辫触");
}
@@ -94,6 +105,7 @@
// 鍏宠仈閫氱煡鍗曠粍鎵�
for (CombParam.CombMat combMat : param.getCombMats()) {
WaitMatin waitMatin = waitMatinService.selectOne(new EntityWrapper<WaitMatin>()
+
.eq("bill_no",param.getBillNo()).eq("seq_no",combMat.getSeqNo()));
if (waitMatin == null) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ca34741..12005de 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,9 +19,9 @@
#url: jdbc:sqlserver://192.168.3.99:1433;databasename=gdasrs
#username: sa
#password: eisoft
- url: jdbc:sqlserver://47.97.1.152:51433;databasename=sxjzasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=sxjzasrs
username: sa
- password: Zoneyung@zy56$
+ password: sa@123
mvc:
static-path-pattern: /**
redis:
diff --git a/src/main/resources/mapper/PltBarcodeMapper.xml b/src/main/resources/mapper/PltBarcodeMapper.xml
index 67a68b8..7e9b785 100644
--- a/src/main/resources/mapper/PltBarcodeMapper.xml
+++ b/src/main/resources/mapper/PltBarcodeMapper.xml
@@ -11,12 +11,16 @@
<result column="mat_no" property="matNo" />
<result column="mat_name" property="matName" />
<result column="qty" property="qty" />
+ <result column="all_qty" property="allQty"/>
<result column="loc_no" property="locNo" />
<result column="specs" property="specs" />
+ <result column="source" property="source"/>
+ <result column="supplier" property="supplier"/>
<result column="unit" property="unit" />
<result column="size" property="size" />
<result column="color" property="color" />
<result column="weight" property="weight" />
+ <result column="all_weight" property="allWeight"/>
<result column="memo" property="memo" />
<result column="link_erp" property="linkErp" />
<result column="io_status" property="ioStatus" />
diff --git a/src/main/webapp/static/js/pltBarcode/pltBarcode.js b/src/main/webapp/static/js/pltBarcode/pltBarcode.js
index ed152f9..3d25d07 100644
--- a/src/main/webapp/static/js/pltBarcode/pltBarcode.js
+++ b/src/main/webapp/static/js/pltBarcode/pltBarcode.js
@@ -28,12 +28,17 @@
,{field: 'matNo', align: 'center',title: '鐗╂枡缂栫爜'}
,{field: 'matName', align: 'center',title: '鐗╂枡鍚嶇О'}
,{field: 'qty', align: 'center',title: '鏁伴噺'}
+ ,{field: 'allQty', align: 'center',title: '鎬绘暟閲�'}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'unit', align: 'center',title: '鍗曚綅'}
,{field: 'size', align: 'center',title: '灏哄', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曢噸', hide: true}
+ ,{field: 'weight', align: 'center',title: '鍗曢噸' }
+ ,{field: 'allWeight', align: 'center',title: '鎬婚噸'}
+ ,{field: 'source', align: 'center',title: '鏉ユ簮'}
+ ,{field: 'supplier', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'batchNumber', align: 'center',title: '渚涘簲鍟�'}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
,{field: 'linkErp$', align: 'center',title: 'ERP杩炵嚎', hide: true}
,{field: 'ioStatus$', align: 'center',title: '瀹屾垚鐘舵��'}
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index f31081e..37efd52 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -96,6 +96,26 @@
<span>鐢熶骇鏃ユ湡</span>
<input id="memo" type="text">
</div>
+<!-- <div class="form-item">-->
+<!-- <span>鏉ユ簮</span>-->
+<!-- <input id="source" type="text" placeholder="鎵爜 / 杈撳叆" onkeyup="find(this)" autocomplete="off">-->
+<!-- </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label">鏉ユ簮</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="source" name="source" class="layui-input" type="text" style="display: none">
+ <input id="Source$" name="Source$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="matTypeBymatType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="matTypeBymatTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="form-item">
+ <span>渚涘簲鍟�</span>
+ <input id="supplier1" type="text">
+ </div>
<div class="form-item">
<span>鍗曚綅</span>
<input id="unit" type="text" disabled="disabled">
diff --git a/version/db/sxjzasrs20211227.bak b/version/db/sxjzasrs20211227.bak
deleted file mode 100644
index 97ec4c9..0000000
--- a/version/db/sxjzasrs20211227.bak
+++ /dev/null
Binary files differ
--
Gitblit v1.9.1