From 4e46937e6311840fd3a146e77bca36908f2d914e Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 12 一月 2026 15:39:10 +0800
Subject: [PATCH] #1
---
/dev/null | 55 -----------
src/main/java/com/zy/asrs/utils/MatExcelListener.java | 3
src/main/webapp/views/pda/index.html | 4
src/main/webapp/views/pda/stockIn.html | 3
src/main/java/com/zy/asrs/service/WaitPakinService.java | 4
src/main/webapp/views/pda/stockOut.html | 1
src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java | 40 --------
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 36 -------
src/main/webapp/views/pda/comb.html | 9 -
src/main/java/com/zy/asrs/controller/MatController.java | 23 ----
src/main/java/com/zy/asrs/controller/MobileController.java | 63 ------------
src/main/webapp/views/pda/matQuery.html | 17 ++-
12 files changed, 19 insertions(+), 239 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
deleted file mode 100644
index 436216e..0000000
--- a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package com.zy.asrs.controller;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.R;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.MatBarcode;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.MobileAdjustParam;
-import com.zy.asrs.service.MatBarcodeService;
-import com.zy.asrs.service.MatService;
-import com.zy.asrs.service.MobileService;
-import com.zy.asrs.service.WaitPakinService;
-import com.zy.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@RequestMapping
-@RestController
-public class BarcodeMatnrController extends BaseController {
- @Autowired
- private MatBarcodeService matBarcodeService;
- @Autowired
- private MobileService mobileService;
- @Autowired
- private MatService matService;
- @Autowired
- private WaitPakinService waitPakinService;
- /*
- * 鐗╂枡鎵樼洏缁戝畾鍒嗛〉鏌ヨ
- * */
- @RequestMapping(value = "/barcodeMatnr/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){
- excludeTrash(param);
- EntityWrapper<MatBarcode> wrapper = new EntityWrapper<>();
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- else {
- wrapper.orderBy("modi_time", false);
- }
- return R.ok(matBarcodeService.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("/barcodeMatnr/matnrLostBarcode")
- @ManagerAuth(memo = "鐗╂枡鎵樼洏瑙ｇ粦")
- public R matnrLostBarcode(@RequestBody List<MatBarcode> list) {
- matBarcodeService.deleteMatBarcode(list);
- return R.ok();
- }
-
- /*
- * 鎵归噺缁勬墭
- * */
- @RequestMapping("/barcodeMatnr/matnrAndBarcode")
- @ManagerAuth(memo = "鐗╂枡鎵樼洏鎵归噺缁勬墭")
- public R matnrAndBarcode(@RequestBody List<MatBarcode> list) {
- if (Cools.isEmpty(list)){
- return R.error(BaseRes.PARAM);
- }
- for (MatBarcode matBarcode : list) {
- if (!matBarcode.getZpallet().equals(list.get(0).getZpallet())){
- throw new CoolException("璇烽�夋嫨鐩稿悓鎵樼洏鐮佺殑鏁版嵁");
- }
- }
- waitPakinService.comb(list);
- return R.ok("缁勬墭鎴愬姛");
-
- }
-
- /*鐗╂枡鎵樼洏缁戝畾
- *
- * */
- @RequestMapping(value = "/barcodeMatnr/add/auth")
- @ManagerAuth
- public R add(WaitPakin waitPakin) {
- if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())){
- return R.error(BaseRes.PARAM);
- }
- matBarcodeService.addBarcodeMatnr(waitPakin);
- return R.ok();
- }
-
- /*缁勬墭
- *
- * */
- @RequestMapping(value = "/barcodeMatnr/add1/auth")
- @ManagerAuth
- public R comb(WaitPakin waitPakin) {
- if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
- return R.error(BaseRes.PARAM);
- }
- mobileService.combToWms(waitPakin);
- return R.ok("缁勬墭鎴愬姛");
- }
-
- /*骞舵澘
- *
- * */
- @RequestMapping(value = "/barcodeMatnr/add2/auth")
- @ManagerAuth
- public R clamp(WaitPakin waitPakin) {
- if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
- return R.error(BaseRes.PARAM);
- }
- Mat mat = matService.selectById(waitPakin.getModiUser());
- MatBarcode matBarcode = matBarcodeService.selectbyMatnr(mat.getMatnr());
- if (matBarcode == null){
- throw new CoolException("璇ョ墿鏂欐湭涓庢墭鐩樼粦瀹�");
- }else {
- if (!matBarcode.getZpallet().equals(waitPakin.getBarcode())){
- throw new CoolException("璇ョ墿鏂欎笌鍏朵粬鎵樼洏缁戝畾锛屼笉鑳戒笌褰撳墠鎵樼洏"+waitPakin.getBarcode()+"缁戝畾锛屼笌璇ョ墿鏂欑粦瀹氱殑鎵樼洏鏄�"+matBarcode.getZpallet());
- }
- }
- MobileAdjustParam combParam=new MobileAdjustParam();
- ArrayList<CombParam.CombMat> combMats=new ArrayList<>();
- CombParam.CombMat combMat=new CombParam.CombMat();
- combMat.setMatnr(mat.getMatnr());
- combMat.setMaktx(mat.getMaktx());
-// combMat.setAnfme(waitPakin.getAnfme());
- combMat.setAnfme(1.0);
- combMats.add(combMat);
- combParam.setBarcode(waitPakin.getBarcode());
- combParam.setCombMats(combMats);
- mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
- return R.ok("骞舵澘鎴愬姛");
- }
-}
diff --git a/src/main/java/com/zy/asrs/controller/HalfBarcodeController.java b/src/main/java/com/zy/asrs/controller/HalfBarcodeController.java
deleted file mode 100644
index 089377d..0000000
--- a/src/main/java/com/zy/asrs/controller/HalfBarcodeController.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.zy.asrs.controller;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.core.annotations.ManagerAuth;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.R;
-import com.zy.asrs.entity.HalfBarcode;
-import com.zy.asrs.entity.MatBarcode;
-import com.zy.asrs.service.HalfBarcodeService;
-import com.zy.asrs.service.MatBarcodeService;
-import com.zy.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-@RestController
-@RequestMapping
-public class HalfBarcodeController extends BaseController {
- @Autowired
- private HalfBarcodeService halfBarcodeService;
- /*
- * 鐗╂枡鎵樼洏缁戝畾鍒嗛〉鏌ヨ
- * */
- //@RequestMapping(value = "/halfBarcode/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) {
- excludeTrash(param);
- EntityWrapper<HalfBarcode> wrapper = new EntityWrapper<>();
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- else {
- wrapper.orderBy("modi_time", false);
- }
- return R.ok(halfBarcodeService.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);
- }
- }
- }
-}
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 021d4f3..ac6984f 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -11,10 +11,7 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.KeyValueVo;
-import com.zy.asrs.service.InOutService;
-import com.zy.asrs.service.MatBarcodeService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.common.CodeRes;
@@ -42,8 +39,7 @@
private MatService matService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
- @Autowired
- private MatBarcodeService matBarcodeService;
+
@RequestMapping(value = "/mat/auto/matnr/auth")
public R autoMatnr(){
@@ -125,17 +121,11 @@
return R.error("缂栧彿宸插瓨鍦�");
}
Date now = new Date();
- InOut inOut=new InOut();
mat.setCreateBy(getUserId());
mat.setCreateTime(now);
mat.setUpdateBy(getUserId());
mat.setUpdateTime(now);
mat.setStatus(1);
- inOut.setMatnr(mat.getMatnr());
- inOut.setMaktx(mat.getMaktx());
- inOut.setColor(mat.getColor());
- inOut.setSpecs(mat.getSpecs());
- inOut.setTemp1("");
if (!matService.insert(mat)) {
throw new CoolException("鍟嗗搧妗ｆ娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -151,17 +141,6 @@
mat.setUpdateBy(getUserId());
mat.setUpdateTime(new Date());
matService.updateById(mat);
- return R.ok();
- }
-
- /*鐗╂枡鎵樼洏缁戝畾*/
- @RequestMapping(value = "/mat/barcode/auth")
- @ManagerAuth
- public R addBarcodeMatnr(Mat mat) {
- if (Cools.isEmpty(mat.getUnit())){
- return R.error(BaseRes.PARAM);
- }
- matBarcodeService.addBarcodeMatnrTwo(mat);
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index b2ab2ba..07f3baa 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -58,8 +58,6 @@
@Autowired
private MatService matService;
@Autowired
- private MatBarcodeService matBarcodeService;
- @Autowired
private CommonService commonService;
@Autowired
private WorkService workService;
@@ -489,67 +487,6 @@
}
}
return R.ok().add(vos);
- }
-
- @RequestMapping("/callBarcode")
- @ManagerAuth(memo = "PDA鍛煎彨鎵樼洏鍑哄簱")
- public R callBarcode(@RequestBody CombParam combParam) {
- logger.info("PDA鍛煎彨鎵樼洏鍑哄簱");
- if (combParam == null) {
- return R.parse(BaseRes.PARAM);
- }
- combParam.getCombMats().forEach(combMat -> {
- Mat mat = matService.selectByMatnr(combMat.getMatnr());
- if (mat == null) {
- throw new CoolException("鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
- MatBarcode matBarcode = matBarcodeService.selectbyMatnr(combMat.getMatnr());
- if (matBarcode == null) {
- throw new CoolException("璇ョ墿鏂欐湭涓庢墭鐩樼粦瀹�");
- }
- LocMast locMast = locMastService.selectByBarcode(matBarcode.getZpallet());
- if (locMast == null) {
- throw new CoolException("鏈壘鍒颁笌璇ョ墿鏂欑粦瀹氱殑鎵樼洏");
- }
- int wrkNo = commonService.getWorkNo(0);
- Date now = new Date();
- //鐢熸垚宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(wrkNo);
- wrkMast.setIoTime(new Date());
- wrkMast.setWrkSts(11L);//宸ヤ綔鐘舵�侊細鐢熸垚鍑哄簱ID
- wrkMast.setIoType(101);//鍏ュ嚭搴撶姸鎬侊細骞舵澘鍑哄簱
- wrkMast.setIoPri(13D);//浼樺厛绾�
- wrkMast.setCrnNo(locMast.getCrnNo());
-// wrkMast.setSourceStaNo(dto.getSourceStaNo());//婧愮珯
- wrkMast.setStaNo(101);// 鐩爣绔�
- wrkMast.setSourceLocNo(locMast.getLocNo());// 婧愬簱浣�
- wrkMast.setBarcode(matBarcode.getZpallet()); // 鎵樼洏鐮�
- wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("N"); // 绌烘澘
- wrkMast.setLinkMis("Y");
-// wrkMast.setScWeight(weight);
- wrkMast.setCtnType(0); // 瀹瑰櫒绫诲瀷
- // 鎿嶄綔浜哄憳鏁版嵁
- wrkMast.setAppeTime(now);
- wrkMast.setModiTime(now);
- boolean res = wrkMastService.insert(wrkMast);
- if (!res) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
- if (locMast.getLocSts().equals("F")) {
- locMast.setLocSts("R"); // R.鍑哄簱棰勭害
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)) {
- throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
- }
- } else {
- throw new CoolException(locMast.getLocNo() + "鐩爣搴撲綅鐘舵�佷笉涓篎");
- }
- });
- return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/entity/HalfBarcode.java b/src/main/java/com/zy/asrs/entity/HalfBarcode.java
deleted file mode 100644
index a8ef1fd..0000000
--- a/src/main/java/com/zy/asrs/entity/HalfBarcode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@TableName("cust_half_barcode")
-public class HalfBarcode {
- private static final long serialVersionUID = 1L;
- @TableField("zpallet")
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- private String zpallet;
-
- @ApiModelProperty(value= "缁戝畾鏁伴噺")
- @TableField("anfme")
- private int anfme;
-
- @ApiModelProperty(value= "鍙斁鏁伴噺")
- @TableField("price")
- private int price;
-
- @ApiModelProperty(value= "鎵樼洏瑙勬牸")
- @TableField("specs")
- private String specs;
-}
diff --git a/src/main/java/com/zy/asrs/entity/InOut.java b/src/main/java/com/zy/asrs/entity/InOut.java
deleted file mode 100644
index 0f0ad33..0000000
--- a/src/main/java/com/zy/asrs/entity/InOut.java
+++ /dev/null
@@ -1,110 +0,0 @@
-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 io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.util.Date;
-
-@Data
-@TableName("man_mat_inout")
-public class InOut {
- /**
- * ID
- */
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 鎵�灞炲綊绫�
- */
- @TableField("tag_id")
- private Long tagId;
-
- /**
- * 鍟嗗搧缂栧彿
- */
- @TableField("matnr")
- private String matnr;
-
-
- /**
- * 鍟嗗搧鍚嶇О
- */
- @TableField("maktx")
- private String maktx;
-
- /**
- * 鍒悕
- */
- @TableField("name")
- private String name;
-
- /**
- * 瑙勬牸
- */
- @TableField("specs")
- private String specs;
-
- /**
- * 棰滆壊
- */
- @TableField("color")
- private String color;
-
- /**
- * 鏉＄爜
- */
- @TableField("barcode")
- private String barcode;
-
- /**
- * 鐢熶骇鏃ユ湡
- */
- @TableField("manu_date")
- private String manuDate;
-
- /**
- * 渚涘簲鍟�
- */
- @TableField("supp")
- private String supp;
-
- /**
- * 渚涘簲鍟嗙紪鐮�
- */
- @TableField("supp_code")
- private String suppCode;
-
- @TableField("temp1")
- private String temp1;
-
- @TableField("temp2")
- private String temp2;
-
- @TableField("temp3")
- private String temp3;
-
- @TableField("update_time")
- private String modiTime;
-
-
-
- public InOut() {}
-
- public InOut(String uuid, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, String length, String volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
- this.tagId = tagId;
- this.matnr = matnr;
- this.maktx = maktx;
- this.name = name;
- this.specs = specs;
- this.color = color;
- this.barcode = barcode;
- this.manuDate = manuDate;
- this.supp = supp;
- this.suppCode = suppCode;
- }
-}
diff --git a/src/main/java/com/zy/asrs/entity/MatBarcode.java b/src/main/java/com/zy/asrs/entity/MatBarcode.java
deleted file mode 100644
index 88a6dd1..0000000
--- a/src/main/java/com/zy/asrs/entity/MatBarcode.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.baomidou.mybatisplus.annotations.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-@TableName("cust_matnr_barcode")
-public class MatBarcode implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- private String zpallet;
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- private String matnr;
-
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- private String maktx;
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
-
- @ApiModelProperty(value= "鍨嬪彿")
- private String model;
-}
diff --git a/src/main/java/com/zy/asrs/mapper/HalfBarcodeMapper.java b/src/main/java/com/zy/asrs/mapper/HalfBarcodeMapper.java
deleted file mode 100644
index 3580d23..0000000
--- a/src/main/java/com/zy/asrs/mapper/HalfBarcodeMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.HalfBarcode;
-import org.apache.ibatis.annotations.Select;
-import org.springframework.stereotype.Repository;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-@Repository
-public interface HalfBarcodeMapper extends BaseMapper<HalfBarcode> {
- @Select("select top 1 * from cust_half_barcode where zpallet=#{zpallet}")
- HalfBarcode selectByZpallet(String zpallet);
-
- boolean half(HalfBarcode halfBarcode);
-}
diff --git a/src/main/java/com/zy/asrs/mapper/MatBarcodeMapper.java b/src/main/java/com/zy/asrs/mapper/MatBarcodeMapper.java
deleted file mode 100644
index 2bb0d6b..0000000
--- a/src/main/java/com/zy/asrs/mapper/MatBarcodeMapper.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.MatBarcode;
-import org.apache.ibatis.annotations.Delete;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface MatBarcodeMapper extends BaseMapper<MatBarcode> {
- MatBarcode selectByMatnr(@Param("matnr")String matnr);
-
- @Delete("delete from cust_matnr_barcode where matnr=#{matnr}")
- void deleteByMatnr(String matnr);
-
- String page(Integer pageNo, Integer pageSize, String barcode, Integer spec);
-}
diff --git a/src/main/java/com/zy/asrs/service/HalfBarcodeService.java b/src/main/java/com/zy/asrs/service/HalfBarcodeService.java
deleted file mode 100644
index 6f32752..0000000
--- a/src/main/java/com/zy/asrs/service/HalfBarcodeService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.zy.asrs.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.HalfBarcode;
-
-public interface HalfBarcodeService extends IService<HalfBarcode> {
- HalfBarcode selectByZpallet(String zpallet);
-
- boolean half(HalfBarcode halfBarcode);
-}
diff --git a/src/main/java/com/zy/asrs/service/InOutService.java b/src/main/java/com/zy/asrs/service/InOutService.java
deleted file mode 100644
index fe51dea..0000000
--- a/src/main/java/com/zy/asrs/service/InOutService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.InOut;
-
-public interface InOutService extends IService<InOut> {
- InOut selectByMatnr(String matnr);
-}
diff --git a/src/main/java/com/zy/asrs/service/MatBarcodeService.java b/src/main/java/com/zy/asrs/service/MatBarcodeService.java
deleted file mode 100644
index fa826b5..0000000
--- a/src/main/java/com/zy/asrs/service/MatBarcodeService.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.zy.asrs.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.MatBarcode;
-import com.zy.asrs.entity.WaitPakin;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-@Service
-public interface MatBarcodeService extends IService<MatBarcode> {
- MatBarcode selectbyMatnr(String matnr);
-
- void deleteMatBarcode(List<MatBarcode> list);
-
- void addBarcodeMatnr(WaitPakin waitPakin);
-
- void addBarcodeMatnrTwo(Mat mat);
-
- String page(Map<String, Object> param);
-}
diff --git a/src/main/java/com/zy/asrs/service/WaitPakinService.java b/src/main/java/com/zy/asrs/service/WaitPakinService.java
index 9a796af..b09602a 100644
--- a/src/main/java/com/zy/asrs/service/WaitPakinService.java
+++ b/src/main/java/com/zy/asrs/service/WaitPakinService.java
@@ -1,12 +1,8 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.MatBarcode;
import com.zy.asrs.entity.WaitPakin;
import com.baomidou.mybatisplus.service.IService;
-import java.util.List;
-
public interface WaitPakinService extends IService<WaitPakin> {
- void comb(List<MatBarcode> list);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/HalfBarcodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/HalfBarcodeServiceImpl.java
deleted file mode 100644
index 96ab1c3..0000000
--- a/src/main/java/com/zy/asrs/service/impl/HalfBarcodeServiceImpl.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.zy.asrs.entity.HalfBarcode;
-import com.zy.asrs.mapper.HalfBarcodeMapper;
-import com.zy.asrs.service.HalfBarcodeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service("HalfBarcodeService")
-public class HalfBarcodeServiceImpl extends ServiceImpl<HalfBarcodeMapper, HalfBarcode> implements HalfBarcodeService {
- @Autowired
- private HalfBarcodeMapper halfBarcodeMapper;
- @Override
- public HalfBarcode selectByZpallet(String zpallet) {
- return halfBarcodeMapper.selectByZpallet(zpallet);
- }
-
- @Override
- public boolean half(HalfBarcode halfBarcode) {
- return halfBarcodeMapper.half(halfBarcode);
- }
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
deleted file mode 100644
index b0c4610..0000000
--- a/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.HalfBarcode;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.MatBarcode;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.mapper.MatBarcodeMapper;
-import com.zy.asrs.service.HalfBarcodeService;
-import com.zy.asrs.service.MatBarcodeService;
-import com.zy.asrs.service.MatService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-@Service("MatBarcodeService")
-public class MatBarcodeServiceImpl extends ServiceImpl<MatBarcodeMapper, MatBarcode> implements MatBarcodeService {
- @Autowired
- private MatBarcodeMapper matBarcodeMapper;
- @Autowired
- private MatBarcodeService matBarcodeService;
- @Autowired
- private MatService matService;
- @Autowired
- private HalfBarcodeService halfBarcodeService;
- @Override
- public MatBarcode selectbyMatnr(String matnr) {
- return this.baseMapper.selectByMatnr(matnr);
- }
-
- @Override
- public void deleteMatBarcode(List<MatBarcode> list) {
- for (MatBarcode matBarcode : list) {
- HalfBarcode halfBarcode = halfBarcodeService.selectByZpallet(matBarcode.getZpallet());
- halfBarcode.setAnfme(halfBarcode.getAnfme() - 1);
- halfBarcode.setPrice(halfBarcode.getPrice() + 1);
- if (!halfBarcodeService.half(halfBarcode)){
- throw new CoolException("鏇存柊鍗婃墭淇℃伅澶辫触");
- }
- matBarcodeMapper.deleteByMatnr(matBarcode.getMatnr());
- }
- }
-
- @Override
- public void addBarcodeMatnr(WaitPakin waitPakin) {
- Mat mat = matService.selectById(waitPakin.getModiUser());
- if (mat == null){
- throw new CoolException("鐗╂枡涓嶅瓨鍦紝璇峰厛娣诲姞鐗╂枡鏁版嵁");
- }
- MatBarcode matBarcode = matBarcodeMapper.selectByMatnr(mat.getMatnr());
- if (matBarcode != null){
- throw new CoolException("璇ョ墿鏂欏凡缁忕粦瀹氭墭鐩橈紝璇峰嬁閲嶅缁戝畾");
- }
- if (mat.getColor().equals("鎶ュ簾")){
- throw new CoolException("璇ョ墿鏂欏凡鎶ュ簾锛岃鍕跨粦瀹�");
- }
- HalfBarcode halfBarcode = halfBarcodeService.selectByZpallet(waitPakin.getBarcode());
- if (halfBarcode == null){
- HalfBarcode hb = new HalfBarcode();
- hb.setZpallet(waitPakin.getBarcode());
- hb.setSpecs(waitPakin.getBarcode().substring(0,1));
- hb.setAnfme(1);
- if (Integer.parseInt(waitPakin.getBarcode().substring(0,1))==6){
- hb.setPrice(24-1);
- }else if(Integer.parseInt(waitPakin.getBarcode().substring(0,1))==7){
- hb.setPrice(24-1);
- }else if(Integer.parseInt(waitPakin.getBarcode().substring(0,1))==8){
- hb.setPrice(24-1);
- }
- if (!halfBarcodeService.insert(hb)){
- throw new CoolException("鏇存柊鍗婃墭淇℃伅澶辫触");
- }
- }else {
- if (Integer.parseInt(waitPakin.getBarcode().substring(0,1))==6){
- halfBarcode.setAnfme(halfBarcode.getAnfme() + 1);
- halfBarcode.setPrice(halfBarcode.getPrice()-1);
- }else if(Integer.parseInt(waitPakin.getBarcode().substring(0,1))==7){
- halfBarcode.setAnfme(halfBarcode.getAnfme() + 1);
- halfBarcode.setPrice(halfBarcode.getPrice()-1);
- }else if(Integer.parseInt(waitPakin.getBarcode().substring(0,1))==8){
- halfBarcode.setAnfme(halfBarcode.getAnfme() + 1);
- halfBarcode.setPrice(halfBarcode.getPrice()-1);
- }
- if (!halfBarcodeService.half(halfBarcode)){
- throw new CoolException("鏇存柊鍗婃墭淇℃伅澶辫触");
- }
- }
- MatBarcode mb=new MatBarcode();
- mb.setZpallet(waitPakin.getBarcode());
- mb.setMatnr(mat.getMatnr());
- mb.setMaktx(mat.getMaktx());
- mb.setSpecs(mat.getSpecs());
- mb.setModel(mat.getModel());
- if (!matBarcodeService.insert(mb)){
- throw new CoolException("鐗╂枡鎵樼洏缁戝畾澶辫触");
- }
- }
-
- @Override
- public void addBarcodeMatnrTwo(Mat mat) {
- Mat m = matService.selectById(mat);
- if (m == null){
- throw new CoolException("鐗╂枡涓嶅瓨鍦紝璇峰厛娣诲姞鐗╂枡鏁版嵁");
- }
- MatBarcode matBarcode = matBarcodeMapper.selectByMatnr(mat.getMatnr());
- if (matBarcode != null){
- throw new CoolException("璇ョ墿鏂欏凡缁忕粦瀹氭墭鐩橈紝璇峰嬁閲嶅缁戝畾");
- }
- if (mat.getColor().equals("鎶ュ簾")){
- throw new CoolException("璇ョ墿鏂欏凡鎶ュ簾锛岃鍕跨粦瀹�");
- }
- HalfBarcode halfBarcode = halfBarcodeService.selectByZpallet(mat.getUnit());
- if (halfBarcode == null){
- HalfBarcode hb = new HalfBarcode();
- hb.setZpallet(mat.getUnit());
- hb.setSpecs(mat.getUnit().substring(0,1));
- hb.setAnfme(1);
- if (Integer.parseInt(mat.getUnit().substring(0,1))==6){
- hb.setPrice(24-1);
- }else if(Integer.parseInt(mat.getUnit().substring(0,1))==7){
- hb.setPrice(24-1);
- }else if(Integer.parseInt(mat.getUnit().substring(0,1))==8){
- hb.setPrice(24-1);
- }
- if (!halfBarcodeService.insert(hb)){
- throw new CoolException("鏇存柊鍗婃墭淇℃伅澶辫触");
- }
- }else {
- if (Integer.parseInt(mat.getUnit().substring(0,1))==6){
- halfBarcode.setAnfme(halfBarcode.getAnfme() + 1);
- halfBarcode.setPrice(halfBarcode.getPrice()-1);
- }else if(Integer.parseInt(mat.getUnit().substring(0,1))==7){
- halfBarcode.setAnfme(halfBarcode.getAnfme() + 1);
- halfBarcode.setPrice(halfBarcode.getPrice()-1);
- }else if(Integer.parseInt(mat.getUnit().substring(0,1))==8){
- halfBarcode.setAnfme(halfBarcode.getAnfme() + 1);
- halfBarcode.setPrice(halfBarcode.getPrice()-1);
- }
- if (!halfBarcodeService.half(halfBarcode)){
- throw new CoolException("鏇存柊鍗婃墭淇℃伅澶辫触");
- }
- }
- MatBarcode mb=new MatBarcode();
- mb.setZpallet(mat.getUnit());
- mb.setMatnr(mat.getMatnr());
- mb.setMaktx(mat.getMaktx());
- mb.setSpecs(mat.getSpecs());
- mb.setModel(mat.getModel());
- if (!matBarcodeService.insert(mb)){
- throw new CoolException("鐗╂枡鎵樼洏缁戝畾澶辫触");
- }
- }
-
- @Override
- public String page(Map<String, Object> param) {
- Integer pageNo = Integer.valueOf(param.get("curr").toString());
- Integer pageSize = Integer.valueOf(param.get("limit").toString());
- String barcode = (String) param.get("zpallet");
- Integer spec = Integer.valueOf(param.get("spec").toString());
- return matBarcodeMapper.page(pageNo,pageSize,barcode,spec);
- }
-}
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 0d73b09..6846da3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -73,8 +73,6 @@
@Autowired
private ManLocDetlMapper manLocDetlMapper;
@Autowired
- private MatBarcodeService matBarcodeService;
- @Autowired
private AdjDetlService adjDetlService;
@@ -132,23 +130,6 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
- //鏍￠獙褰撳墠鐗╂枡涓庢墭鐩樼粦瀹氫俊鎭槸鍚︽纭�
- MatBarcode matBarcode = new MatBarcode();
- MatBarcode mb = matBarcodeService.selectbyMatnr(detlDto.getMatnr());
- if (mb != null){
- if (!mb.getZpallet().equals(param.getBarcode())){
- throw new CoolException(detlDto.getMatnr() + "璇ョ墿鏂欎笌鍏朵粬鎵樼洏缁戝畾锛岃鍏堣В缁�");
- }
- }else {
- matBarcode.setZpallet(param.getBarcode());//鎵樼洏鐮�
- matBarcode.setMatnr(mat.getMatnr());//鐗╂枡鍙�
- matBarcode.setMaktx(mat.getMaktx());//鐗╂枡鍚嶇О
- matBarcode.setSpecs(mat.getSpecs());//瑙勬牸
- matBarcode.setModel(mat.getModel());//鍨嬪彿
- if (!matBarcodeService.insert(matBarcode)) {
- throw new CoolException("鐗╂枡涓庢墭鐩樼粦瀹氬け璐�");
- }
- }
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
waitPakin.setProType(detlDto.getProType());
@@ -193,23 +174,6 @@
Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(orderDetl.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
- //鏍￠獙褰撳墠鐗╂枡涓庢墭鐩樼粦瀹氫俊鎭槸鍚︽纭�
- MatBarcode matBarcode = new MatBarcode();
- MatBarcode mb = matBarcodeService.selectbyMatnr(orderDetl.getMatnr());
- if (mb != null){
- if (!mb.getZpallet().equals(param.getBarcode())){
- throw new CoolException(orderDetl.getMatnr() + "璇ョ墿鏂欎笌鍏朵粬鎵樼洏缁戝畾锛岃鍏堣В缁�");
- }
- }else {
- matBarcode.setZpallet(param.getBarcode());//鎵樼洏鐮�
- matBarcode.setMatnr(mat.getMatnr());//鐗╂枡鍙�
- matBarcode.setMaktx(mat.getMaktx());//鐗╂枡鍚嶇О
- matBarcode.setSpecs(mat.getSpecs());//瑙勬牸
- matBarcode.setModel(mat.getModel());//鍨嬪彿
- if (!matBarcodeService.insert(matBarcode)) {
- throw new CoolException("鐗╂枡涓庢墭鐩樼粦瀹氬け璐�");
- }
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
diff --git a/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java
index 346238c..12b5be0 100644
--- a/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java
@@ -27,44 +27,4 @@
private MatService matService;
@Autowired
private WaitPakinService waitPakinService;
-
- @Override
- public void comb(List<MatBarcode> list) {
- String zpallet = list.get(0).getZpallet();
- if (zpallet.length() != 8) {
- throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + zpallet);
- }
- int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", zpallet));
- int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", zpallet));
- WrkMast wrkMast = wrkMastService.selectByBarcode(zpallet);
- if (countLoc > 0 || (countWrk > 0 && wrkMast.getWrkSts() != 15)) {
- throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + zpallet);
- }
- Date now = new Date();
- for (MatBarcode matBarcode : list) {
- Mat mat = matService.selectByMatnr(matBarcode.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(matBarcode.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
- WaitPakin waitPakin1 = new WaitPakin();
- waitPakin1.sync(mat);
- ///waitPakin1.setProType(dto.getProType());
- //waitPakin1.setTemp2(dto.getTemp2());
- //waitPakin1.setOutOrderNo(dto.getOutOrderNo());
- //waitPakin1.setBatch(dto.getBatch());
- waitPakin1.setZpallet(matBarcode.getZpallet()); // 鎵樼洏鐮�
- waitPakin1.setIoStatus("N"); // 鍏ュ嚭鐘舵��
- waitPakin1.setAnfme(1.0); // 鏁伴噺
- waitPakin1.setStatus("Y"); // 鐘舵��
- waitPakin1.setModel(mat.getName());
- //waitPakin1.setAppeUser(waitPakin.getAppeUser());
- waitPakin1.setAppeTime(now);
- //waitPakin1.setModiUser(waitPakin.getAppeUser());
- waitPakin1.setModiTime(now);
- //waitPakin1.setMemo(detlDto.getMemo());
- if (!waitPakinService.insert(waitPakin1)) {
- throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
- }
- }
- }
}
diff --git a/src/main/java/com/zy/asrs/utils/MatExcelListener.java b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
index 842b9cc..fbac23b 100644
--- a/src/main/java/com/zy/asrs/utils/MatExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
@@ -5,11 +5,9 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.InOut;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.Tag;
import com.zy.asrs.mapper.TagMapper;
-import com.zy.asrs.service.InOutService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.TagService;
import com.zy.common.entity.MatExcel;
@@ -59,7 +57,6 @@
TagService tagService = SpringUtils.getBean(TagService.class);
TagMapper tagMapper = SpringUtils.getBean(TagMapper.class);
MatService matService = SpringUtils.getBean(MatService.class);
- InOutService inOutService = SpringUtils.getBean(InOutService.class);
Date now = new Date();
Long tagId;
// 鍒嗙被
diff --git a/src/main/resources/mapper/HalfBarcodeMapper.xml b/src/main/resources/mapper/HalfBarcodeMapper.xml
deleted file mode 100644
index a373715..0000000
--- a/src/main/resources/mapper/HalfBarcodeMapper.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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.HalfBarcodeMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.HalfBarcode">
- <result column="zpallet" property="zpallet"/>
- <result column="anfme" property="anfme" />
- <result column="price" property="price" />
- <result column="specs" property="specs" />
- </resultMap>
-
- <update id="half" parameterType="com.zy.asrs.entity.HalfBarcode">
- UPDATE cust_half_barcode
- <set>
- <if test="anfme != null">
- anfme = #{anfme},
- </if>
- <if test="price != null">
- price = #{price},
- </if>
- </set>
- WHERE zpallet = #{zpallet}
- </update>
-</mapper>
diff --git a/src/main/resources/mapper/MatBarcodeMapper.xml b/src/main/resources/mapper/MatBarcodeMapper.xml
deleted file mode 100644
index 05b2e05..0000000
--- a/src/main/resources/mapper/MatBarcodeMapper.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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.MatBarcodeMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.MatBarcode">
- <result column="zpallet" property="zpallet" />
-<!-- <result column="loc_no" property="locNo" />-->
-<!-- <result column="anfme" property="anfme" />-->
- <result column="matnr" property="matnr" />
- <result column="maktx" property="maktx" />
-<!-- <result column="batch" property="batch" />-->
-<!-- <result column="order_no" property="orderNo" />-->
-
- <result column="specs" property="specs" />
- <result column="model" property="model" />
-<!-- <result column="color" property="color" />-->
-<!-- <result column="brand" property="brand" />-->
-<!-- <result column="unit" property="unit" />-->
-<!-- <result column="price" property="price" />-->
-<!-- <result column="sku" property="sku" />-->
-<!-- <result column="units" property="units" />-->
-<!-- <result column="barcode" property="barcode" />-->
-<!-- <result column="origin" property="origin" />-->
-<!-- <result column="manu" property="manu" />-->
-<!-- <result column="manu_date" property="manuDate" />-->
-<!-- <result column="item_num" property="itemNum" />-->
-<!-- <result column="safe_qty" property="safeQty" />-->
-<!-- <result column="weight" property="weight" />-->
-<!-- <result column="length" property="length" />-->
-<!-- <result column="volume" property="volume" />-->
-<!-- <result column="three_code" property="threeCode" />-->
-<!-- <result column="supp" property="supp" />-->
-<!-- <result column="supp_code" property="suppCode" />-->
-<!-- <result column="be_batch" property="beBatch" />-->
-<!-- <result column="dead_time" property="deadTime" />-->
-<!-- <result column="dead_warn" property="deadWarn" />-->
-<!-- <result column="source" property="source" />-->
-<!-- <result column="inspect" property="inspect" />-->
-<!-- <result column="danger" property="danger" />-->
-
-<!-- <result column="status" property="status" />-->
-<!-- <result column="io_status" property="ioStatus" />-->
-
-<!-- <result column="modi_time" property="modiTime" />-->
-<!-- <result column="modi_user" property="modiUser" />-->
-<!-- <result column="appe_time" property="appeTime" />-->
-<!-- <result column="appe_user" property="appeUser" />-->
-<!-- <result column="memo" property="memo" />-->
- </resultMap>
-
- <select id="selectByMatnr" resultMap="BaseResultMap">
- select top 1 * from cust_matnr_barcode where 1=1 and matnr = #{matnr}
- </select>
-</mapper>
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index d13a022..13b9cb1 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -54,12 +54,11 @@
limit: 500,
cellMinWidth: 50,
cols: [[
- {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
+ {fixed: 'left', align: 'center', field: 'anfme', title: '鏁伴噺', style:'color: blue', width:50},
{field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'},
- {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'},
- {field: 'model', align: 'center',title: '浜у搧浠ｇ爜'}
+ {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'}
]],
- done: function (res, curr, count) {
+ done: function (res, curr, anfme) {
}
});
@@ -101,7 +100,7 @@
let toPush = true;
for (var j=0;j<matData.length;j++){
if (data.matnr === matData[j].matnr) {
- matData[j].count = Number(matData[j].count) + Number(data.count);
+ matData[j].anfme = Number(matData[j].anfme) + Number(data.anfme);
toPush = false;
}
}
diff --git a/src/main/webapp/views/pda/index.html b/src/main/webapp/views/pda/index.html
index 50ecb47..cd3c9db 100644
--- a/src/main/webapp/views/pda/index.html
+++ b/src/main/webapp/views/pda/index.html
@@ -74,8 +74,8 @@
<!-- 瀵艰埅鏍� -->
<ul class="nav">
<li><a id="comb" onclick="nav(this.id)" class="nav-select" href="#">缁勬墭</a></li>
- <li><a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">鍏ュ簱</a></li>
- <li><a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">鍑哄簱</a></li>
+<!-- <li><a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">鍏ュ簱</a></li>-->
+<!-- <li><a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">鍑哄簱</a></li>-->
</ul>
<!-- 涓讳綋鍐呭 -->
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index 37046dc..5bfc1dc 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -85,12 +85,16 @@
<input id="maktx" type="text" disabled="disabled">
</div>
<div class="form-item">
- <span>瑙勬牸</span>
- <input id="specs" type="text" disabled="disabled">
+ <span>鍥惧彿</span>
+ <input id="model" type="text" disabled="disabled">
</div>
<div class="form-item">
<span>鍗曚綅</span>
<input id="unit" type="text" disabled="disabled">
+ </div>
+ <div class="form-item">
+ <span>鎵规鍙�</span>
+ <input id="barcode" type="text" disabled="disabled">
</div>
<div class="form-item">
<span style="vertical-align: middle">鏁伴噺</span>
@@ -125,8 +129,9 @@
if (res.code === 200) {
if (res.data != null) {
$('#maktx').val(res.data.maktx);
- $('#specs').val(res.data.specs);
+ $('#model').val(res.data.model);
$('#unit').val(res.data.unit);
+ $('#barcode').val(res.data.barcode);
countDom.val(initMatCount);
$('#count').focus().select();
}
@@ -144,9 +149,9 @@
*/
function confirm(){
var data = {
- matNo: $('#matnr').val(),
- matName: $('#maktx').val(),
- count: countDom.val()
+ matnr: $('#matnr').val(),
+ maktx: $('#maktx').val(),
+ anfme: countDom.val()
};
parent.addTableData(data);
parent.layer.close(parent.matCodeLayerIdx);
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index e1957e5..9384793 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -121,8 +121,7 @@
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
{field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'},
- {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'},
- {field: 'model', align: 'center',title: '浜у搧浠ｇ爜'}
+ {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'}
]],
done: function (res, curr, count) {
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index 1fc7dfc..54cd9c7 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -132,7 +132,6 @@
{field: 'count', align: 'center', title: '鏁伴噺', event: 'detail', style:'color: blue', width:50},
{field: 'matnr', align: 'center', title: '缂栫爜', event: 'detail'},
{field: 'maktx', align: 'center', title: '鍚嶇О', event: 'detail'},
- {field: 'model', align: 'center',title: '浜у搧浠ｇ爜', event: 'detail'},
{field: 'locNo', align: 'center', title: '搴撲綅', event: 'detail'}
]],
done: function (res, curr, count) {
--
Gitblit v1.9.1