From 93b591f65d0dbc0ab2238fb8a027c58f44e5fb66 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 08 九月 2021 16:12:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/PltBarcode.java | 472 +++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/PltBarcodeServiceImpl.java | 12
src/main/java/com/zy/asrs/entity/param/CombParam.java | 18
src/main/webapp/views/pda/combPro.html | 69 --
src/main/java/com/zy/asrs/entity/CombBillQueryVo.java | 41 +
src/main/java/com/zy/asrs/mapper/PltBarcodeMapper.java | 12
src/main/java/com/zy/asrs/controller/MobileController.java | 21
src/main/java/com/zy/common/CodeBuilder.java | 10
src/main/java/com/zy/asrs/service/PltBarcodeService.java | 8
src/main/java/com/zy/asrs/controller/PltBarcodeController.java | 123 +++++
src/main/java/pltBarcode.sql | 20
src/main/webapp/static/js/pltBarcode/pltBarcode.js | 271 +++++++++++
src/main/webapp/views/pltBarcode/pltBarcode.html | 213 ++++++++
src/main/resources/mapper/PltBarcodeMapper.xml | 31 +
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 116 +++-
15 files changed, 1,344 insertions(+), 93 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 08e1876..9ba2830 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -5,6 +5,7 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.entity.CombBillQueryVo;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkDetl;
@@ -54,7 +55,6 @@
mobileService.comb(combParam, getUserId());
return R.ok();
}
-
/**
* 缁勬墭
@@ -171,18 +171,19 @@
@RequestMapping("/bill/query/auth")
@ManagerAuth(memo = "鏍规嵁閫氱煡鍗曟煡璇㈡槑缁�")
public R billQuery(@RequestParam String billNo){
- List<WaitMatin> waitMatins = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("bill_no", billNo));
+ List<WaitMatin> waitMatins = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("bill_no", billNo).last("and qty > in_qty"));
List<CombBillQueryVo> vos = new ArrayList<>();
- if (!Cools.isEmpty(waitPakins)) {
+ if (!Cools.isEmpty(waitMatins)) {
for (WaitMatin waitMatin : waitMatins) {
CombBillQueryVo vo = new CombBillQueryVo();
- vo.setMatNo(waitMatin.getMatnr());
- vo.setMatName(waitMatin.getMaktx());
- vo.setCount(waitMatin.getAnfme());
- vo.setSupplier(waitMatin.getSupplier());
- vo.setAltme(waitMatin.getAltme());
- vo.setType(waitMatin.getType());
- vo.setLgnum(waitMatin.getLgnum());
+ vo.setMatNo(waitMatin.getMatNo());
+ vo.setMatName(waitMatin.getMatName());
+ vo.setCount(waitMatin.getQty()-waitMatin.getInQty());
+ vo.setBillNo(waitMatin.getBillNo());
+ vo.setSeqNo(waitMatin.getSeqNo());
+ vo.setUnit(waitMatin.getUnit());
+ vo.setSpecs(waitMatin.getSpecs());
+ vo.setSize(waitMatin.getSize());
vo.setColor(waitMatin.getColor());
vos.add(vo);
}
diff --git a/src/main/java/com/zy/asrs/controller/PltBarcodeController.java b/src/main/java/com/zy/asrs/controller/PltBarcodeController.java
new file mode 100644
index 0000000..6a40f5b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/PltBarcodeController.java
@@ -0,0 +1,123 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.PltBarcode;
+import com.zy.asrs.service.PltBarcodeService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class PltBarcodeController extends BaseController {
+
+ @Autowired
+ private PltBarcodeService pltBarcodeService;
+
+ @RequestMapping(value = "/pltBarcode/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(pltBarcodeService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/pltBarcode/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 Map<String, Object> param){
+ EntityWrapper<PltBarcode> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(pltBarcodeService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ 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]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/pltBarcode/add/auth")
+ @ManagerAuth
+ public R add(PltBarcode pltBarcode) {
+ pltBarcodeService.insert(pltBarcode);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/pltBarcode/update/auth")
+ @ManagerAuth
+ public R update(PltBarcode pltBarcode){
+ if (Cools.isEmpty(pltBarcode) || null==pltBarcode.getSeqNo()){
+ return R.error();
+ }
+ pltBarcodeService.updateById(pltBarcode);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/pltBarcode/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ pltBarcodeService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/pltBarcode/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<PltBarcode> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("pltBarcode"));
+ convert(map, wrapper);
+ List<PltBarcode> list = pltBarcodeService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/pltBarcodeQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<PltBarcode> wrapper = new EntityWrapper<>();
+ wrapper.like("mat_no", condition);
+ Page<PltBarcode> page = pltBarcodeService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (PltBarcode pltBarcode : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", pltBarcode.getSeqNo());
+ map.put("value", pltBarcode.getMatNo());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/pltBarcode/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<PltBarcode> wrapper = new EntityWrapper<PltBarcode>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != pltBarcodeService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(PltBarcode.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/CombBillQueryVo.java b/src/main/java/com/zy/asrs/entity/CombBillQueryVo.java
new file mode 100644
index 0000000..1b4bbeb
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/CombBillQueryVo.java
@@ -0,0 +1,41 @@
+package com.zy.asrs.entity;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2021/2/2
+ */
+@Data
+public class CombBillQueryVo {
+
+ private String billNo;
+
+ private Integer seqNo;
+
+ private String matNo;
+
+ private String matName;
+
+ private String specs;
+
+ private String size;
+
+ private String color;
+
+ private Double count;
+
+ private String unit;
+
+// private String warehouse;
+
+// private String mnemonic;
+
+// private String supplier;
+
+// private String lgnum;
+
+ private String type;
+
+// private String altme;
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/PltBarcode.java b/src/main/java/com/zy/asrs/entity/PltBarcode.java
new file mode 100644
index 0000000..8d72c87
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/PltBarcode.java
@@ -0,0 +1,472 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@TableName("asr_plt_barcode")
+public class PltBarcode implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value= "鏉＄爜")
+ @TableId(value = "barcode", type = IdType.INPUT)
+ private String barcode;
+
+ /**
+ * 鍗曟嵁缂栧彿
+ */
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @TableId(value = "bill_no", type = IdType.INPUT)
+ @TableField("bill_no")
+ private String billNo;
+
+ /**
+ * 搴忓彿
+ */
+ @ApiModelProperty(value= "搴忓彿")
+ @TableId(value = "seq_no", type = IdType.INPUT)
+ @TableField("seq_no")
+ private Integer seqNo;
+
+ /**
+ * 鍗曟嵁绫诲瀷 1: 閲囪喘鍏ュ簱 2: 鐢熶骇鍏ュ簱 3: 璋冩嫧鍏ュ簱 4: 閿�鍞��鍥炲叆搴� 5: 鍏朵粬鍏ュ簱
+ */
+ @ApiModelProperty(value= "鍗曟嵁绫诲瀷 1: 閲囪喘鍏ュ簱 2: 鐢熶骇鍏ュ簱 3: 璋冩嫧鍏ュ簱 4: 閿�鍞��鍥炲叆搴� 5: 鍏朵粬鍏ュ簱 ")
+ @TableField("bill_type")
+ private Integer billType;
+
+ /**
+ * 鐗╂枡缂栫爜
+ */
+ @ApiModelProperty(value= "鐗╂枡缂栫爜")
+ @TableField("mat_no")
+ private String matNo;
+
+ /**
+ * 鐗╂枡鍚嶇О
+ */
+ @ApiModelProperty(value= "鐗╂枡鍚嶇О")
+ @TableField("mat_name")
+ private String matName;
+
+ /**
+ * 鏁伴噺
+ */
+ @ApiModelProperty(value= "鏁伴噺")
+ private Double qty;
+
+ /**
+ * 搴撲綅鍙�
+ */
+ @ApiModelProperty(value= "搴撲綅鍙�")
+ @TableField("loc_no")
+ private String locNo;
+
+ /**
+ * 瑙勬牸
+ */
+ @ApiModelProperty(value= "瑙勬牸")
+ private String specs;
+
+ /**
+ * 鍗曚綅
+ */
+ @ApiModelProperty(value= "鍗曚綅")
+ private String unit;
+
+ /**
+ * 灏哄
+ */
+ @ApiModelProperty(value= "灏哄")
+ private String size;
+
+ /**
+ * 棰滆壊
+ */
+ @ApiModelProperty(value= "棰滆壊")
+ private String color;
+
+ /**
+ * 鍗曢噸
+ */
+ @ApiModelProperty(value= "鍗曢噸")
+ private Double weight;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ /**
+ * ERP杩炵嚎 0: 闈炶繛绾� 1: ERP杩炵嚎
+ */
+ @ApiModelProperty(value= "ERP杩炵嚎 0: 闈炶繛绾� 1: ERP杩炵嚎 ")
+ @TableField("link_erp")
+ private Integer linkErp;
+
+ /**
+ * 瀹屾垚鐘舵�� 0: 寰呭鐞� 1: 鍏ュ簱涓� 2: 鍏ュ簱瀹屾垚 3: 鍙栨秷鍏ュ簱
+ */
+ @ApiModelProperty(value= "瀹屾垚鐘舵�� 0: 寰呭鐞� 1: 鍏ュ簱涓� 2: 鍏ュ簱瀹屾垚 3: 鍙栨秷鍏ュ簱 ")
+ @TableField("io_status")
+ private Integer ioStatus;
+
+ /**
+ * 瀹屾垚鏃堕棿
+ */
+ @ApiModelProperty(value= "瀹屾垚鏃堕棿")
+ @TableField("io_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date ioTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("modi_user")
+ private Long modiUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("modi_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date modiTime;
+
+ /**
+ * 寤烘。浜哄憳
+ */
+ @ApiModelProperty(value= "寤烘。浜哄憳")
+ @TableField("appe_user")
+ private Long appeUser;
+
+ /**
+ * 寤烘。鏃堕棿
+ */
+ @ApiModelProperty(value= "寤烘。鏃堕棿")
+ @TableField("appe_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date appeTime;
+
+ 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) {
+ this.barcode = barcode;
+ this.billNo = billNo;
+ this.seqNo = seqNo;
+ this.billType = billType;
+ this.matNo = matNo;
+ this.matName = matName;
+ this.qty = qty;
+ this.locNo = locNo;
+ this.specs = specs;
+ this.unit = unit;
+ this.size = size;
+ this.color = color;
+ this.weight = weight;
+ this.memo = memo;
+ this.linkErp = linkErp;
+ this.ioStatus = ioStatus;
+ this.ioTime = ioTime;
+ this.modiUser = modiUser;
+ this.modiTime = modiTime;
+ this.appeUser = appeUser;
+ this.appeTime = appeTime;
+ }
+
+// PltBarcode pltBarcode = new PltBarcode(
+// null, // 鏉＄爜[闈炵┖]
+// null, // 鍗曟嵁缂栧彿[闈炵┖]
+// null, // 搴忓彿[闈炵┖]
+// null, // 鍗曟嵁绫诲瀷
+// null, // 鐗╂枡缂栫爜[闈炵┖]
+// null, // 鐗╂枡鍚嶇О[闈炵┖]
+// null, // 鏁伴噺
+// null, // 搴撲綅鍙�
+// null, // 瑙勬牸
+// null, // 鍗曚綅
+// null, // 灏哄
+// null, // 棰滆壊
+// null, // 鍗曢噸
+// null, // 澶囨敞
+// null, // ERP杩炵嚎
+// null, // 瀹屾垚鐘舵��
+// null, // 瀹屾垚鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 寤烘。浜哄憳
+// null // 寤烘。鏃堕棿
+// );
+
+ public String getBarcode() {
+ return barcode;
+ }
+
+ public void setBarcode(String barcode) {
+ this.barcode = barcode;
+ }
+
+ public String getBillNo() {
+ return billNo;
+ }
+
+ public void setBillNo(String billNo) {
+ this.billNo = billNo;
+ }
+
+ public Integer getSeqNo() {
+ return seqNo;
+ }
+
+ public void setSeqNo(Integer seqNo) {
+ this.seqNo = seqNo;
+ }
+
+ public Integer getBillType() {
+ return billType;
+ }
+
+ public String getBillType$(){
+ if (null == this.billType){ return null; }
+ switch (this.billType){
+ case 1:
+ return "閲囪喘鍏ュ簱";
+ case 2:
+ return "鐢熶骇鍏ュ簱";
+ case 3:
+ return "璋冩嫧鍏ュ簱";
+ case 4:
+ return "閿�鍞��鍥炲叆搴�";
+ case 5:
+ return "鍏朵粬鍏ュ簱";
+ default:
+ return String.valueOf(this.billType);
+ }
+ }
+
+ public void setBillType(Integer billType) {
+ this.billType = billType;
+ }
+
+ public String getMatNo() {
+ return matNo;
+ }
+
+ public void setMatNo(String matNo) {
+ this.matNo = matNo;
+ }
+
+ public String getMatName() {
+ return matName;
+ }
+
+ public void setMatName(String matName) {
+ this.matName = matName;
+ }
+
+ public Double getQty() {
+ return qty;
+ }
+
+ public void setQty(Double qty) {
+ this.qty = qty;
+ }
+
+ public String getLocNo() {
+ return locNo;
+ }
+
+ public void setLocNo(String locNo) {
+ this.locNo = locNo;
+ }
+
+ public String getSpecs() {
+ return specs;
+ }
+
+ public void setSpecs(String specs) {
+ this.specs = specs;
+ }
+
+ public String getUnit() {
+ return unit;
+ }
+
+ public void setUnit(String unit) {
+ this.unit = unit;
+ }
+
+ public String getSize() {
+ return size;
+ }
+
+ public void setSize(String size) {
+ this.size = size;
+ }
+
+ public String getColor() {
+ return color;
+ }
+
+ public void setColor(String color) {
+ this.color = color;
+ }
+
+ public Double getWeight() {
+ return weight;
+ }
+
+ public void setWeight(Double weight) {
+ this.weight = weight;
+ }
+
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
+
+ public Integer getLinkErp() {
+ return linkErp;
+ }
+
+ public String getLinkErp$(){
+ if (null == this.linkErp){ return null; }
+ switch (this.linkErp){
+ case 0:
+ return "闈炶繛绾�";
+ case 1:
+ return "ERP杩炵嚎";
+ default:
+ return String.valueOf(this.linkErp);
+ }
+ }
+
+ public void setLinkErp(Integer linkErp) {
+ this.linkErp = linkErp;
+ }
+
+ public Integer getIoStatus() {
+ return ioStatus;
+ }
+
+ public String getIoStatus$(){
+ if (null == this.ioStatus){ return null; }
+ switch (this.ioStatus){
+ case 0:
+ return "寰呭鐞�";
+ case 1:
+ return "鍏ュ簱涓�";
+ case 2:
+ return "鍏ュ簱瀹屾垚";
+ case 3:
+ return "鍙栨秷鍏ュ簱";
+ default:
+ return String.valueOf(this.ioStatus);
+ }
+ }
+
+ public void setIoStatus(Integer ioStatus) {
+ this.ioStatus = ioStatus;
+ }
+
+ public Date getIoTime() {
+ return ioTime;
+ }
+
+ public String getIoTime$(){
+ if (Cools.isEmpty(this.ioTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
+ }
+
+ public void setIoTime(Date ioTime) {
+ this.ioTime = ioTime;
+ }
+
+ public Long getModiUser() {
+ return modiUser;
+ }
+
+ public String getModiUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public void setModiUser(Long modiUser) {
+ this.modiUser = modiUser;
+ }
+
+ public Date getModiTime() {
+ return modiTime;
+ }
+
+ public String getModiTime$(){
+ if (Cools.isEmpty(this.modiTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ }
+
+ public void setModiTime(Date modiTime) {
+ this.modiTime = modiTime;
+ }
+
+ public Long getAppeUser() {
+ return appeUser;
+ }
+
+ public String getAppeUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.appeUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public void setAppeUser(Long appeUser) {
+ this.appeUser = appeUser;
+ }
+
+ public Date getAppeTime() {
+ return appeTime;
+ }
+
+ public String getAppeTime$(){
+ if (Cools.isEmpty(this.appeTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+ }
+
+ public void setAppeTime(Date appeTime) {
+ this.appeTime = appeTime;
+ }
+
+
+}
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 38107d1..48d8d66 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -12,13 +12,25 @@
private List<CombMat> combMats;
+ private String billNo;
+
public static class CombMat {
+
+ private String seqNo;
// 浜у搧缂栧彿
private String matNo;
// 浜у搧鏁伴噺
private Double count;
+
+ public String getSeqNo() {
+ return seqNo;
+ }
+
+ public void setSeqNo(String seqNo) {
+ this.seqNo = seqNo;
+ }
public String getMatNo() {
return matNo;
@@ -38,6 +50,12 @@
}
+ public String getBillNo() { return billNo; }
+
+ public void setBillNo(String billNo) {
+ this.billNo = billNo;
+ }
+
public String getBarcode() {
return barcode;
}
diff --git a/src/main/java/com/zy/asrs/mapper/PltBarcodeMapper.java b/src/main/java/com/zy/asrs/mapper/PltBarcodeMapper.java
new file mode 100644
index 0000000..5615121
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/PltBarcodeMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.PltBarcode;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface PltBarcodeMapper extends BaseMapper<PltBarcode> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/PltBarcodeService.java b/src/main/java/com/zy/asrs/service/PltBarcodeService.java
new file mode 100644
index 0000000..7ec5a15
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/PltBarcodeService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.PltBarcode;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface PltBarcodeService extends IService<PltBarcode> {
+
+}
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 d4ab78d..52ccdc3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -4,13 +4,14 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.MatCode;
-import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.PltBarcode;
+import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.service.MatCodeService;
-import com.zy.asrs.service.MobileService;
-import com.zy.asrs.service.WaitPakinService;
-import com.zy.asrs.utils.VersionUtils;
+import com.zy.asrs.service.*;
+import com.zy.ints.entity.WaitMatin;
+import com.zy.ints.service.WaitMatinService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -27,7 +28,13 @@
@Autowired
private MatCodeService matCodeService;
@Autowired
- private WaitPakinService waitPakinService;
+ private WaitMatinService waitMatinService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private PltBarcodeService pltBarcodeService;
@Override
@Transactional
@@ -35,29 +42,86 @@
if (Cools.isEmpty(param.getBarcode()) || param.getCombMats().isEmpty()) {
throw new CoolException(BaseRes.PARAM);
}
- int count = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode()).eq("io_status", "N"));
- if (count > 0) {
+// int countPak = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+// eq("zpallet", param.getBarcode()).eq("io_status", "N"));
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
+ int countPlt = pltBarcodeService.selectCount(new EntityWrapper<PltBarcode>().eq("barcode",param.getBarcode()));
+ if (countPlt > 0 || countLoc > 0 || countWrk > 0) {
throw new CoolException("鏉＄爜鏁版嵁宸插瓨鍦�");
}
- for (CombParam.CombMat combMat : param.getCombMats()) {
- MatCode matCode = matCodeService.selectById(combMat.getMatNo());
- if (Cools.isEmpty(matCode)) {
- throw new CoolException("浜у搧鏁版嵁閿欒");
- }
- WaitPakin waitPakin = new WaitPakin();
- waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
- waitPakin.setStatus("Y"); // 鐘舵��
- waitPakin.setQty(combMat.getCount()); // 鏁伴噺
- waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
- waitPakin.setAppeUser(userId);
- waitPakin.setAppeTime(new Date());
- waitPakin.setModiUser(userId);
- waitPakin.setModiTime(new Date());
- VersionUtils.setWaitPakIn(waitPakin, matCode);
- if (!waitPakinService.insert(waitPakin)) {
- throw new CoolException("淇濆瓨鏁版嵁澶辫触");
+ Date now = new Date();
+ if (Cools.isEmpty(param.getBillNo())) {
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ MatCode matCode = matCodeService.selectOne(new EntityWrapper<MatCode>().eq("mat_no", combMat.getMatNo()));
+ if (Cools.isEmpty(matCode)) {
+ throw new CoolException("鐗╂枡鏁版嵁閿欒");
+ }
+ PltBarcode pltBarcode = new PltBarcode();
+ pltBarcode.setBarcode(param.getBarcode());
+ pltBarcode.setBillNo("");
+ pltBarcode.setSeqNo(0);
+ pltBarcode.setBillType(5);
+ pltBarcode.setMatNo(matCode.getMatNo());
+ pltBarcode.setMatName(matCode.getMatName());
+ pltBarcode.setQty(combMat.getCount());
+ pltBarcode.setUnit(matCode.getUnit());
+ pltBarcode.setSpecs(matCode.getSpecs());
+ pltBarcode.setSize(matCode.getSize());
+ pltBarcode.setColor(matCode.getColor());
+ pltBarcode.setLinkErp(0);
+ pltBarcode.setModiUser(userId);
+ pltBarcode.setModiTime(now);
+ pltBarcode.setAppeUser(userId);
+ pltBarcode.setAppeTime(now);
+
+ if (!pltBarcodeService.insert(pltBarcode)) {
+ throw new CoolException("淇濆瓨鏁版嵁澶辫触");
+ }
+ }
+ } else {
+ // 鍏宠仈閫氱煡鍗曠粍鎵�
+ 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) {
+ throw new CoolException("閫氱煡鍗曚笉瀛樺湪" + combMat.getMatNo() + "鏁版嵁锛�");
+ }
+
+ if (combMat.getCount() > (waitMatin.getQty()-waitMatin.getInQty())) {
+ throw new CoolException(combMat.getMatNo() + "缁勬墭鐗╂枡鏁伴噺涓嶈冻锛�");
+ }
+
+ PltBarcode pltBarcode = new PltBarcode();
+ pltBarcode.setBarcode(param.getBarcode());
+ pltBarcode.setBillNo(waitMatin.getBillNo());
+ pltBarcode.setSeqNo(waitMatin.getSeqNo());
+ pltBarcode.setBillType(waitMatin.getBillType());
+ pltBarcode.setMatNo(waitMatin.getMatNo());
+ pltBarcode.setMatName(waitMatin.getMatName());
+ pltBarcode.setQty(combMat.getCount());
+ pltBarcode.setUnit(waitMatin.getUnit());
+ pltBarcode.setSpecs(waitMatin.getSpecs());
+ pltBarcode.setSize(waitMatin.getSize());
+ pltBarcode.setColor(waitMatin.getColor());
+ pltBarcode.setLinkErp(waitMatin.getLinkErp());
+ pltBarcode.setModiUser(userId);
+ pltBarcode.setModiTime(now);
+ pltBarcode.setAppeUser(userId);
+ pltBarcode.setAppeTime(now);
+
+ if (!pltBarcodeService.insert(pltBarcode)) {
+ throw new CoolException("淇濆瓨鏁版嵁澶辫触");
+ }
+
+ waitMatin.setInQty(combMat.getCount() + waitMatin.getInQty());
+ if (!waitMatinService.update(waitMatin,new EntityWrapper<WaitMatin>()
+ .eq("bill_no",param.getBillNo()).eq("seq_no",combMat.getSeqNo()))){
+ throw new CoolException("鏇存柊鏁版嵁澶辫触");
+ }
+
}
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/PltBarcodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PltBarcodeServiceImpl.java
new file mode 100644
index 0000000..6bb6e49
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/PltBarcodeServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.PltBarcodeMapper;
+import com.zy.asrs.entity.PltBarcode;
+import com.zy.asrs.service.PltBarcodeService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("pltBarcodeService")
+public class PltBarcodeServiceImpl extends ServiceImpl<PltBarcodeMapper, PltBarcode> implements PltBarcodeService {
+
+}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 424a365..7fe1f35 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -18,11 +18,11 @@
generator.url="192.168.4.208:1433;databasename=xgmasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="ints_stock_sync";
- generator.packagePath="com.zy.ints";
- generator.html=false;
- generator.js=false;
- generator.htmlDetail=false;
+ generator.table="asr_plt_barcode";
+ generator.packagePath="com.zy.asrs";
+// generator.html=false;
+// generator.js=false;
+// generator.htmlDetail=false;
generator.build();
}
diff --git a/src/main/java/pltBarcode.sql b/src/main/java/pltBarcode.sql
new file mode 100644
index 0000000..edb804a
--- /dev/null
+++ b/src/main/java/pltBarcode.sql
@@ -0,0 +1,20 @@
+-- save pltBarcode record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'pltBarcode/pltBarcode.html', 'pltBarcode绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'pltBarcode#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'pltBarcode#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'pltBarcode#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'pltBarcode#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'pltBarcode#btn-export', '瀵煎嚭', '', '3', '4', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'pltBarcode#btn-into', '瀵煎叆', '', '3', '5', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'pltBarcode/pltBarcode.html', N'缁勬墭鏁版嵁绠＄悊', 鈥�222鈥�, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'pltBarcode#view', N'鏌ヨ', '20469', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'pltBarcode#btn-add', N'鏂板', '20469', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'pltBarcode#btn-edit', N'缂栬緫', '20469', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'pltBarcode#btn-delete', N'鍒犻櫎', '20469', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'pltBarcode#btn-export', N'瀵煎嚭', '20469', '3', '4', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'pltBarcode#btn-into', N'瀵煎叆', '20469', '3', '5', '1');
diff --git a/src/main/resources/mapper/PltBarcodeMapper.xml b/src/main/resources/mapper/PltBarcodeMapper.xml
new file mode 100644
index 0000000..67a68b8
--- /dev/null
+++ b/src/main/resources/mapper/PltBarcodeMapper.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.PltBarcodeMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.PltBarcode">
+ <result column="barcode" property="barcode" />
+ <result column="bill_no" property="billNo" />
+ <result column="seq_no" property="seqNo" />
+ <result column="bill_type" property="billType" />
+ <result column="mat_no" property="matNo" />
+ <result column="mat_name" property="matName" />
+ <result column="qty" property="qty" />
+ <result column="loc_no" property="locNo" />
+ <result column="specs" property="specs" />
+ <result column="unit" property="unit" />
+ <result column="size" property="size" />
+ <result column="color" property="color" />
+ <result column="weight" property="weight" />
+ <result column="memo" property="memo" />
+ <result column="link_erp" property="linkErp" />
+ <result column="io_status" property="ioStatus" />
+ <result column="io_time" property="ioTime" />
+ <result column="modi_user" property="modiUser" />
+ <result column="modi_time" property="modiTime" />
+ <result column="appe_user" property="appeUser" />
+ <result column="appe_time" property="appeTime" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/pltBarcode/pltBarcode.js b/src/main/webapp/static/js/pltBarcode/pltBarcode.js
new file mode 100644
index 0000000..29ddbdd
--- /dev/null
+++ b/src/main/webapp/static/js/pltBarcode/pltBarcode.js
@@ -0,0 +1,271 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#pltBarcode',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/pltBarcode/list/auth',
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
+ ,{field: 'billNo', align: 'center',title: '鍗曟嵁缂栧彿'}
+ ,{field: 'seqNo', align: 'center',title: '搴忓彿'}
+ ,{field: 'billType$', align: 'center',title: '鍗曟嵁绫诲瀷', hide: true}
+ ,{field: 'matNo', align: 'center',title: '鐗╂枡缂栫爜'}
+ ,{field: 'matName', align: 'center',title: '鐗╂枡鍚嶇О'}
+ ,{field: 'qty', 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: 'memo', align: 'center',title: '澶囨敞'}
+ ,{field: 'linkErp$', align: 'center',title: 'ERP杩炵嚎', hide: true}
+ ,{field: 'ioStatus$', align: 'center',title: '瀹屾垚鐘舵��', hide: true}
+ ,{field: 'ioTime$', align: 'center',title: '瀹屾垚鏃堕棿', hide: true}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', style: 'cursor:pointer', hide: true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
+ ,{field: 'appeUser$', align: 'center',title: '寤烘。浜哄憳',event: 'appeUser', style: 'cursor:pointer', hide: true}
+ ,{field: 'appeTime$', align: 'center',title: '寤烘。鏃堕棿', hide: true}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(pltBarcode)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(pltBarcode)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ var ids = checkStatus.map(function (d) {
+ return d.seqNo;
+ });
+ del(ids);
+ break;
+ case 'exportData':
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'pltBarcode': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/pltBarcode/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(pltBarcode)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ var ids = [data.seqNo];
+ del(ids);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender();
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/pltBarcode/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/pltBarcode/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender() {
+ layDate.render({
+ elem: '#ioTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#modiTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#appeTime\\$',
+ type: 'datetime'
+ });
+
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/views/pda/combPro.html b/src/main/webapp/views/pda/combPro.html
index 2f8b0a8..113a633 100644
--- a/src/main/webapp/views/pda/combPro.html
+++ b/src/main/webapp/views/pda/combPro.html
@@ -133,18 +133,18 @@
</tr>
</table>
</div>
- <div class="form-item">
- <table style="display: inline">
- <tr>
- <td>
- <span style="width: 35px; margin-right: 5px">鍗曞彿</span>
- </td>
- <td style="text-align: left">
- <input id="supplier" type="text" disabled="disabled">
- </td>
- </tr>
- </table>
- </div>
+<!-- <div class="form-item">-->
+<!-- <table style="display: inline">-->
+<!-- <tr>-->
+<!-- <td>-->
+<!-- <span style="width: 35px; margin-right: 5px">鍗曞彿</span>-->
+<!-- </td>-->
+<!-- <td style="text-align: left">-->
+<!-- <input id="supplier" type="text" disabled="disabled">-->
+<!-- </td>-->
+<!-- </tr>-->
+<!-- </table>-->
+<!-- </div>-->
</div>
<div class="form-item" style="margin-top: 5px">
<span style="vertical-align: middle">鏁伴噺</span>
@@ -187,7 +187,8 @@
width: 70
},
{field: 'matNo', align: 'center', title: '浜у搧缂栫爜', event: 'modify'},
- {field: 'matName', align: 'center', title: '浜у搧鍚嶇О', event: 'modify'}
+ {field: 'matName', align: 'center', title: '浜у搧鍚嶇О', event: 'modify'},
+ {field: 'seqNo', align: 'center', title: '搴忓彿', event: 'modify'}
// {field: 'color', align: 'center', title: '棰滆壊', event: 'modify',}
]],
done: function (res, curr, count) {
@@ -209,6 +210,7 @@
success: function (layero, index) {
$('#matNo').val(data.matNo);
$('#matName').val(data.matName);
+ // $('#supplier').val(data.billNo);
$('#count').val(data.count);
maxCount = data.count;
}
@@ -326,7 +328,7 @@
// 绉婚櫎鐗╂枡
function remove() {
var matNo = $('#matNo').val();
- var supplier = $("#supplier").val() === '' ? null : $("#supplier").val();
+ // var supplier = $("#supplier").val() === '' ? null : $("#supplier").val();
for (var j = 0; j < matData.length; j++) {
if (matNo === matData[j].matNo) {
matData.splice(j, 1);
@@ -346,44 +348,6 @@
tableIns.reload({data: matData});
}
- function test() {
- $.ajax({
- url: baseUrl+"/erp/update",
- headers: {'token': localStorage.getItem('token')},
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- async: false,
- success: function (res) {
- if (res.code === 200) {
- layer.msg("娴嬭瘯鍔熻兘鎴愬姛");
- } else if (res.code === 403) {
- top.location.href = baseUrl + "/pda";
- } else {
- tips(res.msg, true)
- }
- }
- });
- }
-
- function test() {
- $.ajax({
- url: baseUrl+"/erp/outUpdate",
- headers: {'token': localStorage.getItem('token')},
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- async: false,
- success: function (res) {
- if (res.code === 200) {
- layer.msg("娴嬭瘯鍔熻兘鎴愬姛");
- } else if (res.code === 403) {
- top.location.href = baseUrl + "/pda";
- } else {
- tips(res.msg, true)
- }
- }
- });
- }
-
// 缁勬墭
function comb() {
var barcode = $('#code').val();
@@ -401,6 +365,7 @@
return;
}
var billNo = $('#billNo').val();
+ debugger
$.ajax({
url: baseUrl + "/mobile/comb/auth",
headers: {'token': localStorage.getItem('token')},
diff --git a/src/main/webapp/views/pltBarcode/pltBarcode.html b/src/main/webapp/views/pltBarcode/pltBarcode.html
new file mode 100644
index 0000000..2e9a3d9
--- /dev/null
+++ b/src/main/webapp/views/pltBarcode/pltBarcode.html
@@ -0,0 +1,213 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 鎼滅储鏍� -->
+<div id="search-box" class="layui-form layui-card-header">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <!-- 寰呮坊鍔� -->
+ <div id="data-search-btn" class="layui-btn-container layui-form-item">
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+ </div>
+</div>
+
+<!-- 琛ㄦ牸 -->
+<div class="layui-form">
+ <table class="layui-hide" id="pltBarcode" lay-filter="pltBarcode"></table>
+</div>
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</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>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/pltBarcode/pltBarcode.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鏉＄爜: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="barcode" placeholder="璇疯緭鍏ユ潯鐮�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鍗曟嵁缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="billNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">搴忓彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="seqNo" placeholder="璇疯緭鍏ュ簭鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曟嵁绫诲瀷: </label>
+ <div class="layui-input-block">
+ <select name="billType">
+ <option value="">璇烽�夋嫨鍗曟嵁绫诲瀷</option>
+ <option value="1">閲囪喘鍏ュ簱</option>
+ <option value="2">鐢熶骇鍏ュ簱</option>
+ <option value="3">璋冩嫧鍏ュ簱</option>
+ <option value="4">閿�鍞��鍥炲叆搴�</option>
+ <option value="5">鍏朵粬鍏ュ簱</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鐗╂枡缂栫爜: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="matNo" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鐗╂枡鍚嶇О: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="matName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏁伴噺: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="qty" placeholder="璇疯緭鍏ユ暟閲�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">搴撲綅鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="locNo" placeholder="璇疯緭鍏ュ簱浣嶅彿">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瑙勬牸: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="specs" placeholder="璇疯緭鍏ヨ鏍�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曚綅: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="unit" placeholder="璇疯緭鍏ュ崟浣�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">灏哄: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="size" placeholder="璇疯緭鍏ュ昂瀵�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">棰滆壊: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="color" placeholder="璇疯緭鍏ラ鑹�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曢噸: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="weight" placeholder="璇疯緭鍏ュ崟閲�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">ERP杩炵嚎: </label>
+ <div class="layui-input-block">
+ <select name="linkErp">
+ <option value="">璇烽�夋嫨ERP杩炵嚎</option>
+ <option value="0">闈炶繛绾�</option>
+ <option value="1">ERP杩炵嚎</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹屾垚鐘舵��: </label>
+ <div class="layui-input-block">
+ <select name="ioStatus">
+ <option value="">璇烽�夋嫨瀹屾垚鐘舵��</option>
+ <option value="0">寰呭鐞�</option>
+ <option value="1">鍏ュ簱涓�</option>
+ <option value="2">鍏ュ簱瀹屾垚</option>
+ <option value="3">鍙栨秷鍏ュ簱</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹屾垚鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="ioTime" id="ioTime$" placeholder="璇疯緭鍏ュ畬鎴愭椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼浜哄憳: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="modiUser" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="modiTime" id="modiTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">寤烘。浜哄憳: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="appeUser" placeholder="璇疯緭鍏ュ缓妗ｄ汉鍛�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">寤烘。鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="appeTime" id="appeTime$" placeholder="璇疯緭鍏ュ缓妗ｆ椂闂�">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
--
Gitblit v1.9.1