From 25bd8e7a6437bc1b66c6fee2f99d9cb2e3117acd Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 28 十月 2022 13:27:38 +0800
Subject: [PATCH] #
---
src/main/java/checkRecord.sql | 18 +
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 5
src/main/webapp/static/js/locDetlStatis/locDetlStatis.js | 5
src/main/resources/mapper/LocDetlMapper.xml | 3
src/main/resources/mapper/LocMastMapper.xml | 3
src/main/java/com/zy/asrs/mapper/CheckRecordMapper.java | 12
src/main/java/com/zy/asrs/controller/WrkMastController.java | 123 ++++++++
src/main/java/com/zy/common/CodeBuilder.java | 4
src/main/webapp/static/js/checkRecord/checkRecord.js | 258 +++++++++++++++++
src/main/java/com/zy/asrs/entity/CheckRecord.java | 120 ++++++++
src/main/java/com/zy/asrs/controller/CheckRecordController.java | 125 ++++++++
src/main/java/com/zy/asrs/service/CheckRecordService.java | 8
src/main/java/com/zy/asrs/entity/dto/WrkDetlWithCheck.java | 9
src/main/java/com/zy/asrs/service/impl/CheckRecordServiceImpl.java | 12
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 1
src/main/webapp/views/checkRecord/checkRecord.html | 140 +++++++++
src/main/resources/mapper/CheckRecordMapper.xml | 19 +
src/main/java/com/zy/asrs/service/LocMastService.java | 1
18 files changed, 860 insertions(+), 6 deletions(-)
diff --git a/src/main/java/checkRecord.sql b/src/main/java/checkRecord.sql
new file mode 100644
index 0000000..5b2a76d
--- /dev/null
+++ b/src/main/java/checkRecord.sql
@@ -0,0 +1,18 @@
+-- save checkRecord record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'checkRecord/checkRecord.html', 'checkRecord绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'checkRecord#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'checkRecord#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'checkRecord#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'checkRecord#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'checkRecord#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'checkRecord/checkRecord.html', N'checkRecord绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'checkRecord#view', N'鏌ヨ', '60586', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'checkRecord#btn-add', N'鏂板', '60586', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'checkRecord#btn-edit', N'缂栬緫', '60586', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'checkRecord#btn-delete', N'鍒犻櫎', '60586', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'checkRecord#btn-export', N'瀵煎嚭', '60586', '3', '4', '1');
diff --git a/src/main/java/com/zy/asrs/controller/CheckRecordController.java b/src/main/java/com/zy/asrs/controller/CheckRecordController.java
new file mode 100644
index 0000000..3874c82
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/CheckRecordController.java
@@ -0,0 +1,125 @@
+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.CheckRecord;
+import com.zy.asrs.service.CheckRecordService;
+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 CheckRecordController extends BaseController {
+
+ @Autowired
+ private CheckRecordService checkRecordService;
+
+ @RequestMapping(value = "/checkRecord/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(checkRecordService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/checkRecord/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<CheckRecord> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(CheckRecord.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(checkRecordService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ 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 = "/checkRecord/add/auth")
+ @ManagerAuth
+ public R add(CheckRecord checkRecord) {
+ checkRecordService.insert(checkRecord);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/checkRecord/update/auth")
+ @ManagerAuth
+ public R update(CheckRecord checkRecord){
+ if (Cools.isEmpty(checkRecord) || null==checkRecord.getLocNo()){
+ return R.error();
+ }
+ checkRecordService.updateById(checkRecord);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/checkRecord/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ checkRecordService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/checkRecord/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<CheckRecord> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("checkRecord"));
+ convert(map, wrapper);
+ List<CheckRecord> list = checkRecordService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/checkRecordQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<CheckRecord> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<CheckRecord> page = checkRecordService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (CheckRecord checkRecord : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", checkRecord.getLocNo());
+ map.put("value", checkRecord.getLocNo());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/checkRecord/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<CheckRecord> wrapper = new EntityWrapper<CheckRecord>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != checkRecordService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(CheckRecord.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 3a6a9c5..9a28809 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -10,10 +10,12 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.dto.WrkDetlWithCheck;
+import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -23,6 +25,16 @@
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private CheckRecordService checkRecordService;
@RequestMapping(value = "/wrkMast/{id}/auth")
@ManagerAuth
@@ -166,4 +178,111 @@
}
+ /********************************杈归攱鏂板**************************/
+ @GetMapping(value = "/wrkMast/checkDetl")
+ public R pickDetl(String barcode) {
+ WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
+ if (Cools.isEmpty(wrkMast)) {
+ return R.error("鏃犳硶閫氳繃鎵樼洏鐮佹壘鍒板搴斿伐浣滄。");
+ }
+ if (wrkMast.getIoType() != 107) {
+ return R.error("宸ヤ綔妗ｉ潪鎹℃枡浠诲姟");
+ }
+ if (wrkMast.getWrkSts() != 14){
+ return R.error("鐩樼偣浠诲姟姝ｅ湪鎵ц涓�,璇风瓑寰呰澶囪繍琛岀粨鏉熷悗杩涜鎿嶄綔");
+ }
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+
+ return R.ok(wrkDetls);
+ }
+
+ /**
+ * 鏍规嵁鐩樼偣淇敼搴撳瓨
+ * @return
+ */
+ @Transactional
+ @PostMapping("/wrkMast/storeCheck")
+ @ManagerAuth(memo = "鏍规嵁鐩樼偣淇敼搴撳瓨")
+ public R storeCheck(@RequestBody List<WrkDetlWithCheck> wrkDetls){
+ Date now = new Date();
+ Integer confirmIsZero = 0;
+ if (wrkDetls == null || wrkDetls.size() <= 0){
+ return R.error("璇蜂紶鍏ユ暟鎹�");
+ }
+ if (Cools.isEmpty(wrkDetls.get(0).getBarcode())) {
+
+ return R.error("鎵樼洏鐮乕barcode]涓虹┖");
+ }
+ WrkMast wrkMast = wrkMastService.selectByBarcode(wrkDetls.get(0).getBarcode());
+
+ for (WrkDetlWithCheck wrkDetl : wrkDetls) {
+ if (Cools.isEmpty(wrkDetl.getBarcode())) {
+ return R.error("鎵樼洏鐮乕barcode]涓虹┖");
+ }
+ if (Cools.isEmpty(wrkDetl.getMatnr())) {
+ return R.error("鐗╂枡缂栫爜[matnr]涓虹┖");
+ }
+ Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ return R.error("鐗╂枡缂栫爜[matnr]鍦ㄧ墿鏂欐。妗堟壘涓嶅埌");
+
+ }
+ if (Cools.isEmpty(wrkDetl.getAnfme())) {
+ return R.error("鐩樼偣鍓嶆暟閲廩anfme]涓虹┖");
+ }
+ if (wrkDetl.getConfirmQty() == null) {
+ return R.error("鐩樼偣纭閲廩confirm]涓虹┖");
+ }
+ if (wrkDetl.getConfirmQty() == 0){
+ confirmIsZero++;
+ }
+
+ }
+ /**
+ * 濡傛灉鏁翠釜list閲岀殑confirmQty鏁伴噺鍏ㄦ槸0, 琛ㄧず鏁翠釜搴撲綅鏃犱换浣曞簱瀛�,鍒犲伐浣滄。, 搴撲綅鏀逛负O
+ */
+ if (confirmIsZero == wrkDetls.size()){
+ locDetlService.delete(new EntityWrapper<LocDetl>()
+ .eq("loc_no",wrkMast.getSourceLocNo()));
+ locMastService.updateLocSts(wrkMast.getSourceLocNo(),"O");
+ wrkMastService.delete(new EntityWrapper<WrkMast>()
+ .eq("wrk_no",wrkMast.getWrkNo()));
+ wrkDetlService.delete(new EntityWrapper<WrkDetl>()
+ .eq("wrk_no",wrkMast.getWrkNo()));
+ return R.ok("搴撳瓨娓呯悊鎴愬姛");
+ }else {
+ locMastService.updateLocSts(wrkMast.getSourceLocNo(),"F");
+ locDetlService.delete(new EntityWrapper<LocDetl>()
+ .eq("loc_no",wrkMast.getSourceLocNo()));
+ for (WrkDetlWithCheck wrkDetl : wrkDetls) {
+ LocDetl locDetl = new LocDetl();
+ Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
+ locDetl.sync(mat);
+ locDetl.setZpallet(wrkMast.getBarcode());
+ locDetl.setAnfme(wrkDetl.getConfirmQty());
+ locDetl.setBatch(wrkDetl.getBatch());
+ locDetl.setAppeTime(now);
+ locDetl.setModiTime(now);
+ locDetl.setAppeUser(getUserId());
+ locDetl.setModiUser(getUserId());
+ locDetl.setLocNo(wrkMast.getSourceLocNo());
+ locDetlService.insert(locDetl);
+
+ CheckRecord checkRecord = new CheckRecord();
+ checkRecord.sync(mat);
+ checkRecord.setAnfme(wrkDetl.getAnfme());
+ checkRecord.setBarcode(wrkMast.getBarcode());
+ checkRecord.setLocNo(wrkMast.getSourceLocNo());
+ checkRecord.setCreateTime(now);
+ checkRecord.setBatch(wrkDetl.getBatch());
+ checkRecord.setConfirmQty(locDetl.getAnfme());
+ checkRecordService.insert(checkRecord);
+
+ }
+ }
+
+ return R.ok("搴撳瓨鏇存柊宸叉垚鍔�");
+ }
+
+
}
diff --git a/src/main/java/com/zy/asrs/entity/CheckRecord.java b/src/main/java/com/zy/asrs/entity/CheckRecord.java
new file mode 100644
index 0000000..1714226
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/CheckRecord.java
@@ -0,0 +1,120 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.zy.common.utils.Synchro;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_check_record")
+public class CheckRecord implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 搴撲綅鍙�
+ */
+ @ApiModelProperty(value= "搴撲綅鍙�")
+ @TableId(value = "loc_no", type = IdType.INPUT)
+ @TableField("loc_no")
+ private String locNo;
+
+ /**
+ * 鎵樼洏鐮�
+ */
+ @ApiModelProperty(value= "鎵樼洏鐮�")
+ private String barcode;
+
+ /**
+ * 鐗╂枡浠ｇ爜
+ */
+ @ApiModelProperty(value= "鐗╂枡浠ｇ爜")
+ private String matnr;
+
+ /**
+ * 鐗╂枡鍚嶇О
+ */
+ @ApiModelProperty(value= "鐗╂枡鍚嶇О")
+ private String maktx;
+
+ /**
+ * 瑙勬牸
+ */
+ @ApiModelProperty(value= "瑙勬牸")
+ private String specs;
+
+ /**
+ * 鎵瑰彿
+ */
+ @ApiModelProperty(value= "鎵瑰彿")
+ private String batch;
+
+ /**
+ * 鐩樼偣鍓嶆暟閲�
+ */
+ @ApiModelProperty(value= "鐩樼偣鍓嶆暟閲�")
+ private Double anfme;
+
+ /**
+ * 鐩樼偣纭閲�
+ */
+ @ApiModelProperty(value= "鐩樼偣纭閲�")
+ @TableField("confirm_qty")
+ private Double confirmQty;
+
+ /**
+ * 璁板綍鏃堕棿
+ */
+ @ApiModelProperty(value= "璁板綍鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ public CheckRecord() {}
+
+ public CheckRecord(String locNo,String barcode,String matnr,String maktx,String specs,String batch,Double anfme,Double confirmQty,Date createTime) {
+ this.locNo = locNo;
+ this.barcode = barcode;
+ this.matnr = matnr;
+ this.maktx = maktx;
+ this.specs = specs;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.confirmQty = confirmQty;
+ this.createTime = createTime;
+ }
+
+// CheckRecord checkRecord = new CheckRecord(
+// null, // 搴撲綅鍙穂闈炵┖]
+// null, // 鎵樼洏鐮�
+// null, // 鐗╂枡浠ｇ爜
+// null, // 鐗╂枡鍚嶇О
+// null, // 瑙勬牸
+// null, // 鎵瑰彿
+// null, // 鐩樼偣鍓嶆暟閲�
+// null, // 鐩樼偣纭閲�
+// null // 璁板綍鏃堕棿
+// );
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/dto/WrkDetlWithCheck.java b/src/main/java/com/zy/asrs/entity/dto/WrkDetlWithCheck.java
new file mode 100644
index 0000000..5b81b1b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/dto/WrkDetlWithCheck.java
@@ -0,0 +1,9 @@
+package com.zy.asrs.entity.dto;
+
+import com.zy.asrs.entity.WrkDetl;
+import lombok.Data;
+
+@Data
+public class WrkDetlWithCheck extends WrkDetl {
+ private Double confirmQty;
+}
diff --git a/src/main/java/com/zy/asrs/mapper/CheckRecordMapper.java b/src/main/java/com/zy/asrs/mapper/CheckRecordMapper.java
new file mode 100644
index 0000000..5a08e2a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/CheckRecordMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.CheckRecord;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface CheckRecordMapper extends BaseMapper<CheckRecord> {
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 2e3abcf..da9fcbc 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -21,4 +21,5 @@
@Select("select count(*) as count from asr_loc_mast where 1=1 and loc_sts = 'O' and loc_type1 = #{locType1} and crn_no = #{crnNo}")
Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("crnNo") Integer crnNo);
+ void updateLocSts(@Param("locNo") String locNo,@Param("locSts") String locSts);
}
diff --git a/src/main/java/com/zy/asrs/service/CheckRecordService.java b/src/main/java/com/zy/asrs/service/CheckRecordService.java
new file mode 100644
index 0000000..5d0c9c2
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/CheckRecordService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.CheckRecord;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface CheckRecordService extends IService<CheckRecord> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 85e64e7..f54455b 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -45,4 +45,5 @@
// 瀵瑰悓缁勮揣鐗╄繘琛岀Щ搴撴搷浣�
void breakUp(String locNo, List<String> excludeLocNos);
+ void updateLocSts(String locNo, String locSts);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/CheckRecordServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CheckRecordServiceImpl.java
new file mode 100644
index 0000000..051854f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/CheckRecordServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.CheckRecordMapper;
+import com.zy.asrs.entity.CheckRecord;
+import com.zy.asrs.service.CheckRecordService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("checkRecordService")
+public class CheckRecordServiceImpl extends ServiceImpl<CheckRecordMapper, CheckRecord> implements CheckRecordService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 23ce15a..ec77dd4 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -146,4 +146,9 @@
workService.shuttleTransfer(groupLoc);
}
+ @Override
+ public void updateLocSts(String locNo, String locSts) {
+ this.baseMapper.updateLocSts(locNo,locSts);
+ }
+
}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index cde6922..773f4e7 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -17,10 +17,10 @@
// generator.table="sys_host";
// sqlserver
generator.sqlOsType = SqlOsType.SQL_SERVER;
- generator.url="10.10.10.100:1433;databasename=bfasrs";
+ generator.url="192.168.4.15:1433;databasename=bfasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="asr_bas_ste_err_log";
+ generator.table="asr_check_record";
generator.packagePath="com.zy.asrs";
generator.build();
}
diff --git a/src/main/resources/mapper/CheckRecordMapper.xml b/src/main/resources/mapper/CheckRecordMapper.xml
new file mode 100644
index 0000000..b6aede8
--- /dev/null
+++ b/src/main/resources/mapper/CheckRecordMapper.xml
@@ -0,0 +1,19 @@
+<?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.CheckRecordMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.CheckRecord">
+ <result column="loc_no" property="locNo" />
+ <result column="barcode" property="barcode" />
+ <result column="matnr" property="matnr" />
+ <result column="maktx" property="maktx" />
+ <result column="specs" property="specs" />
+ <result column="batch" property="batch" />
+ <result column="anfme" property="anfme" />
+ <result column="confirm_qty" property="confirmQty" />
+ <result column="create_time" property="createTime" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index f6244f9..5bf4832 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -173,9 +173,10 @@
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
, a.matnr
, sum(a.anfme) as anfme
+ , a.specs
from asr_loc_detl a
where 1=1
- group by a.matnr
+ group by a.matnr, a.specs
</select>
<select id="selectPakoutByRule" resultMap="BaseResultMap">
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index a98b6f4..12a1b11 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -37,6 +37,9 @@
<result column="ctn_no" property="ctnNo" />
</resultMap>
+ <update id="updateLocSts">
+ UPDATE asr_loc_mast SET loc_sts = #{locSts} WHERE loc_no = #{locNo}
+ </update>
<select id="queryFreeLocMast" resultMap="BaseResultMap">
select
diff --git a/src/main/webapp/static/js/checkRecord/checkRecord.js b/src/main/webapp/static/js/checkRecord/checkRecord.js
new file mode 100644
index 0000000..2f6344a
--- /dev/null
+++ b/src/main/webapp/static/js/checkRecord/checkRecord.js
@@ -0,0 +1,258 @@
+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: '#checkRecord',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/checkRecord/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�'}
+ ,{field: 'matnr', align: 'center',title: '鐗╂枡浠ｇ爜'}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'anfme', align: 'center',title: '鐩樼偣鍓嶆暟閲�'}
+ ,{field: 'confirmQty', align: 'center',title: '鐩樼偣纭閲�'}
+ ,{field: 'createTime$', align: 'center',title: '璁板綍鏃堕棿'}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ 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(checkRecord)', 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(checkRecord)', 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;
+ }
+ del(checkStatus.map(function (d) {
+ return d.locNo;
+ }));
+ break;
+ case 'exportData':
+ admin.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 = {
+ 'checkRecord': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/checkRecord/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(checkRecord)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.locNo]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/checkRecord/"+(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+"/checkRecord/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(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['createTime\\$']:null
+ });
+
+ }, 300);
+ }
+ 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/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
index fd1da33..bd9b8b3 100644
--- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -2,10 +2,13 @@
function getCol() {
var cols = [
{field: 'anfme', align: 'center',title: '搴撳瓨鏁伴噺', style: 'font-weight: bold'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
];
arrRemove(detlCols, "field", "anfme")
arrRemove(detlCols, "field", "zpallet")
- cols.push.apply(cols, detlCols);
+ // cols.push.apply(cols, detlCols);
// cols.push({field: 'anfme', align: 'center',title: '鏁伴噺', style: 'font-weight: bold'}
// )
return cols;
diff --git a/src/main/webapp/views/checkRecord/checkRecord.html b/src/main/webapp/views/checkRecord/checkRecord.html
new file mode 100644
index 0000000..6c4fd1f
--- /dev/null
+++ b/src/main/webapp/views/checkRecord/checkRecord.html
@@ -0,0 +1,140 @@
+<!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">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="checkRecord" lay-filter="checkRecord"></table>
+ </div>
+ </div>
+</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 layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</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/checkRecord/checkRecord.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-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="locNo" 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="barcode" placeholder="璇疯緭鍏ユ墭鐩樼爜">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐗╂枡鍚嶇О: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="maktx" 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="batch" placeholder="璇疯緭鍏ユ壒鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩樼偣鍓嶆暟閲�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="anfme" placeholder="璇疯緭鍏ョ洏鐐瑰墠鏁伴噺">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩樼偣纭閲�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="confirmQty" placeholder="璇疯緭鍏ョ洏鐐圭‘璁ら噺">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">璁板綍鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="createTime" id="createTime$" 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