From ff3a5d59ab306792fe86b6805db61470e94bca79 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 07 五月 2024 15:47:42 +0800
Subject: [PATCH] #空桶入库完成
---
src/main/java/com/zy/asrs/service/EmptyBarrelInService.java | 8
src/main/java/com/zy/asrs/controller/EmptyBarrelInController.java | 147 +++++++++++
src/main/java/com/zy/asrs/entity/EmptyBarrelIn.java | 50 +++
src/main/java/com/zy/asrs/controller/LocDetlController.java | 2
src/main/java/com/zy/asrs/service/BasDevpService.java | 1
src/main/java/com/zy/asrs/mapper/BasDevpMapper.java | 1
src/main/java/com/zy/asrs/controller/WorkController.java | 14
src/main/java/com/zy/asrs/mapper/EmptyBarrelInMapper.java | 12
src/main/java/com/zy/common/CodeBuilder.java | 4
src/main/webapp/views/pakStore/matQuery.html | 2
src/main/java/com/zy/asrs/utils/Utils.java | 17 +
src/main/java/com/zy/asrs/service/impl/EmptyBarrelInServiceImpl.java | 12
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2
src/main/java/emptyBarrelIn.sql | 18 +
src/main/java/com/zy/asrs/controller/MatController.java | 18 +
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 11
src/main/resources/mapper/BasDevpMapper.xml | 12
src/main/webapp/static/js/pakStore/pakStore.js | 4
src/main/webapp/views/emptyBarrelIn/emptyBarrelIn.html | 104 ++++++++
src/main/resources/application.yml | 4
src/main/webapp/static/js/emptyBarrelIn/emptyBarrelIn.js | 284 +++++++++++++++++++++
src/main/resources/mapper/EmptyBarrelInMapper.xml | 14 +
22 files changed, 727 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/EmptyBarrelInController.java b/src/main/java/com/zy/asrs/controller/EmptyBarrelInController.java
new file mode 100644
index 0000000..4dc691d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/EmptyBarrelInController.java
@@ -0,0 +1,147 @@
+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.EmptyBarrelIn;
+import com.zy.asrs.entity.Mat;
+import com.zy.asrs.service.EmptyBarrelInService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.asrs.service.MatService;
+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 EmptyBarrelInController extends BaseController {
+
+ @Autowired
+ private EmptyBarrelInService emptyBarrelInService;
+ @Autowired
+ private MatService matService;
+
+ @RequestMapping(value = "/emptyBarrelIn/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(emptyBarrelInService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/emptyBarrelIn/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<EmptyBarrelIn> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(emptyBarrelInService.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 = "/emptyBarrelIn/add/auth")
+ @ManagerAuth
+ public R add(@RequestBody EmptyBarrelIn emptyBarrelIn) {
+ int i = emptyBarrelInService.selectCount(new EntityWrapper<>());
+ if (i>0){
+ return R.error("宸插瓨鍦ㄦ鍦ㄥ叆搴撶殑鏁版嵁锛岃淇敼鎴栧垹闄�");
+ }
+ Mat mat = new Mat();
+ if (!Cools.isEmpty(emptyBarrelIn.getMatnr())){
+ mat = matService.selectByMatnr(emptyBarrelIn.getMatnr());
+ }
+ if (!Cools.isEmpty(mat)){
+ emptyBarrelIn.setMatnr(mat.getMatnr());
+ emptyBarrelIn.setMaktx(mat.getMaktx());
+ }
+ emptyBarrelInService.insert(emptyBarrelIn);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/emptyBarrelIn/update/auth")
+ @ManagerAuth
+ public R update(@RequestBody EmptyBarrelIn emptyBarrelIn){
+ if (Cools.isEmpty(emptyBarrelIn) || null==emptyBarrelIn.getId()){
+ return R.error();
+ }
+ Mat mat = new Mat();
+ if (!Cools.isEmpty(emptyBarrelIn.getMatnr())){
+ mat = matService.selectByMatnr(emptyBarrelIn.getMatnr());
+ }
+ if (!Cools.isEmpty(mat)){
+ emptyBarrelIn.setMatnr(mat.getMatnr());
+ emptyBarrelIn.setMaktx(mat.getMaktx());
+ }
+ emptyBarrelInService.updateById(emptyBarrelIn);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/emptyBarrelIn/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") int[] ids){
+ for (int id : ids){
+ emptyBarrelInService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/emptyBarrelIn/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<EmptyBarrelIn> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("emptyBarrelIn"));
+ convert(map, wrapper);
+ List<EmptyBarrelIn> list = emptyBarrelInService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/emptyBarrelInQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<EmptyBarrelIn> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<EmptyBarrelIn> page = emptyBarrelInService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (EmptyBarrelIn emptyBarrelIn : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", emptyBarrelIn.getId());
+ map.put("value", emptyBarrelIn.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/emptyBarrelIn/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<EmptyBarrelIn> wrapper = new EntityWrapper<EmptyBarrelIn>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != emptyBarrelInService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(EmptyBarrelIn.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 84fe873..9ae2e2c 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -157,7 +157,7 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- if (entry.getKey().equals("loc_no")) {
+ if (entry.getKey().equals("loc_no") || entry.getKey().equals("locNo")) {
wrapper.eq("loc_no", String.valueOf(entry.getValue()));
locNo=String.valueOf(entry.getValue());
} else {
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 1206105..524cd96 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -104,6 +104,24 @@
}
+ @RequestMapping(value = "/mat/emptyBucketsList/auth")
+ @ManagerAuth
+ public R emptyBucketsList(@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){
+
+ int tagId = 46;
+
+ return R.ok(matService.getPage(new Page<>(curr, limit)
+ , String.valueOf(tagId)
+ , param.get("matnr")
+ , param.get("maktx"))
+ );
+
+ }
+
private void convert(Map<String, Object> map, EntityWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index d656b7a..122cb6e 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.controller;
import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
@@ -38,6 +39,12 @@
@ManagerAuth()
public R availablePutSite(){
return R.ok().add(basDevpService.getAvailableInSite());
+ }
+
+ @RequestMapping("/available/put/site5")
+ @ManagerAuth()
+ public R availablePutSite5(){
+ return R.ok().add(basDevpService.getAvailableInSite5());
}
@RequestMapping("/available/empty/put/site")
@@ -80,9 +87,12 @@
}
@RequestMapping("/full/store/put/start")
- @ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
+// @ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
- return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
+
+ return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,9527L));
+
+// return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
}
@RequestMapping("/plate/out/start")
diff --git a/src/main/java/com/zy/asrs/entity/EmptyBarrelIn.java b/src/main/java/com/zy/asrs/entity/EmptyBarrelIn.java
new file mode 100644
index 0000000..f94825d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/EmptyBarrelIn.java
@@ -0,0 +1,50 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("man_emptyBarrel_in")
+public class EmptyBarrelIn implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+// @ApiModelProperty(value= "")
+ @TableId(value = "id", type = IdType.AUTO)
+ @TableField("id")
+ private Integer id;
+
+ @ApiModelProperty(value= "")
+ @TableField("matnr")
+ private String matnr;
+
+ @ApiModelProperty(value= "")
+ @TableField("batch")
+ private String batch;
+
+ @ApiModelProperty(value= "")
+ @TableField("maktx")
+ private String maktx;
+
+ public EmptyBarrelIn() {}
+
+ public EmptyBarrelIn(String matnr,String batch,String maktx) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.maktx = maktx;
+ }
+
+// EmptyBarrelIn emptyBarrelIn = new EmptyBarrelIn(
+// null, //
+// null, //
+// null //
+// );
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
index 668d2ca..6587c63 100644
--- a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
@@ -13,6 +13,7 @@
public interface BasDevpMapper extends BaseMapper<BasDevp> {
List<Integer> getAvailableInSite(@Param("typeNo") Integer typeNo);
+ List<Integer> getAvailableInSite5(@Param("typeNo") Integer typeNo);
List<Integer> getAvailableOutSite(@Param("typeNo") Integer typeNo);
}
diff --git a/src/main/java/com/zy/asrs/mapper/EmptyBarrelInMapper.java b/src/main/java/com/zy/asrs/mapper/EmptyBarrelInMapper.java
new file mode 100644
index 0000000..5668503
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/EmptyBarrelInMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.EmptyBarrelIn;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface EmptyBarrelInMapper extends BaseMapper<EmptyBarrelIn> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasDevpService.java b/src/main/java/com/zy/asrs/service/BasDevpService.java
index 00b3589..d8dee8a 100644
--- a/src/main/java/com/zy/asrs/service/BasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/BasDevpService.java
@@ -12,6 +12,7 @@
* @return
*/
List<Integer> getAvailableInSite();
+ List<Integer> getAvailableInSite5();
/**
* 绌烘澘鍏ュ簱绔�
diff --git a/src/main/java/com/zy/asrs/service/EmptyBarrelInService.java b/src/main/java/com/zy/asrs/service/EmptyBarrelInService.java
new file mode 100644
index 0000000..3b6e9cc
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/EmptyBarrelInService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.EmptyBarrelIn;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface EmptyBarrelInService extends IService<EmptyBarrelIn> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
index babb339..cf5264e 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -23,6 +23,11 @@
}
@Override
+ public List<Integer> getAvailableInSite5() {
+ return this.baseMapper.getAvailableInSite5(1);
+ }
+
+ @Override
public List<Integer> getAvailableEmptyInSite() {
return this.baseMapper.getAvailableInSite(10);
}
@@ -55,9 +60,9 @@
if(station.getLoading()==null || !station.getLoading().equals("Y")) {
throw new CoolException(devpNo+"绔欑偣鏃犵墿");
}
- if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo() < 9990) {
- throw new CoolException(devpNo+"绔欑偣宸叉湁宸ヤ綔鍙�");
- }
+// if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo() < 9990) {
+// throw new CoolException(devpNo+"绔欑偣宸叉湁宸ヤ綔鍙�");
+// }
// if(!station.getInEnable().equals("Y")) {
// throw new CoolException(devpNo+"绔欑偣涓嶆槸鍙叆鐘舵��");
// }
diff --git a/src/main/java/com/zy/asrs/service/impl/EmptyBarrelInServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/EmptyBarrelInServiceImpl.java
new file mode 100644
index 0000000..3f85e49
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/EmptyBarrelInServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.EmptyBarrelInMapper;
+import com.zy.asrs.entity.EmptyBarrelIn;
+import com.zy.asrs.service.EmptyBarrelInService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("emptyBarrelInService")
+public class EmptyBarrelInServiceImpl extends ServiceImpl<EmptyBarrelInMapper, EmptyBarrelIn> implements EmptyBarrelInService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 3da48ca..4ac5abe 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -90,7 +90,7 @@
// 妫�绱㈠簱浣�
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(1, 1, null, null,null,null,0, locTypeDto,0);
+ StartupDto dto = commonService.getLocNo(2, 1, param.getDevpNo(), null,null,null,0, locTypeDto,0);
// 鐢熸垚宸ヤ綔鍙�
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 41cefd3..04c0498 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -26,6 +26,12 @@
public static final List<Integer> SECOND_GROUP_ROW_LIST2 = new ArrayList<Integer>() {{
add(7);add(8);
}};
+ public static final List<Integer> FIRST_GROUP_ROW_LIST3 = new ArrayList<Integer>() {{
+ add(9);
+ }};
+ public static final List<Integer> SECOND_GROUP_ROW_LIST3 = new ArrayList<Integer>() {{
+ add(10);
+ }};
public static List<String> getGroupLocNo(String locNo, Boolean pakIn) {
int row = getRow(locNo);
List<String> result = new ArrayList<>();
@@ -51,6 +57,17 @@
for (Integer integer : clone) {
result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
}
+ }else if (FIRST_GROUP_ROW_LIST3.contains(row)) {
+ for (Integer groupRow : FIRST_GROUP_ROW_LIST3) {
+ result.add(zerofill(String.valueOf(groupRow), 2) + locNo.substring(2));
+ }
+ } else if (SECOND_GROUP_ROW_LIST3.contains(row)) {
+ List<Integer> clone = Arrays.asList(new Integer[SECOND_GROUP_ROW_LIST3.size()]);
+ Collections.copy(clone, SECOND_GROUP_ROW_LIST3);
+ Collections.reverse(clone);
+ for (Integer integer : clone) {
+ result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
+ }
}
if (!pakIn) {
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index a223b73..94acfe7 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="192.168.4.15:1433;databasename=mdqdasrs";
+ generator.url="127.0.0.1:1433;databasename=mdqdasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="man_loc_check_trim";
+ generator.table="man_emptyBarrel_in";
generator.packagePath="com.zy.asrs";
generator.build();
}
diff --git a/src/main/java/emptyBarrelIn.sql b/src/main/java/emptyBarrelIn.sql
new file mode 100644
index 0000000..bb0fdf8
--- /dev/null
+++ b/src/main/java/emptyBarrelIn.sql
@@ -0,0 +1,18 @@
+-- save emptyBarrelIn record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'emptyBarrelIn/emptyBarrelIn.html', 'emptyBarrelIn绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'emptyBarrelIn#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'emptyBarrelIn#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'emptyBarrelIn#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'emptyBarrelIn#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'emptyBarrelIn#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'emptyBarrelIn/emptyBarrelIn.html', N'emptyBarrelIn绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'emptyBarrelIn#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'emptyBarrelIn#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'emptyBarrelIn#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'emptyBarrelIn#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'emptyBarrelIn#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 39df923..c82b271 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -17,7 +17,7 @@
# url: jdbc:sqlserver://10.10.10.100:1433;databasename=mdqdasrs
# username: sa
# password: Dtzhcy101+
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=mdqdasrs
+ url: jdbc:sqlserver://10.10.10.212:1433;databasename=mdqdasrs
username: sa
password: sa@123
mvc:
@@ -95,4 +95,4 @@
password: "a.222222"
lcid: 2052
# 淇濇寔true
- enable: true
\ No newline at end of file
+ enable: false
\ No newline at end of file
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index 4f6e131..82bb791 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -55,6 +55,18 @@
group by abd.dev_no
</select>
+ <select id="getAvailableInSite5" resultType="java.lang.Integer">
+ select
+ abd.dev_no
+ from asr_bas_devp abd
+ left join asr_sta_desc asd on abd.dev_no = asd.stn_no
+ where 1=1
+ and asd.type_no = #{typeNo}
+ and asd.crn_no = 5
+ -- and abd.in_enable = 'Y'
+ group by abd.dev_no
+ </select>
+
<select id="getAvailableOutSite" resultType="java.lang.Integer">
select
abd.dev_no
diff --git a/src/main/resources/mapper/EmptyBarrelInMapper.xml b/src/main/resources/mapper/EmptyBarrelInMapper.xml
new file mode 100644
index 0000000..025c0ae
--- /dev/null
+++ b/src/main/resources/mapper/EmptyBarrelInMapper.xml
@@ -0,0 +1,14 @@
+<?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.EmptyBarrelInMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.EmptyBarrelIn">
+ <id column="id" property="id" />
+ <result column="matnr" property="matnr" />
+ <result column="batch" property="batch" />
+ <result column="maktx" property="maktx" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/emptyBarrelIn/emptyBarrelIn.js b/src/main/webapp/static/js/emptyBarrelIn/emptyBarrelIn.js
new file mode 100644
index 0000000..59992f1
--- /dev/null
+++ b/src/main/webapp/static/js/emptyBarrelIn/emptyBarrelIn.js
@@ -0,0 +1,284 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin','xmSelect'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+ var xmSelect = layui.xmSelect;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#emptyBarrelIn',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/emptyBarrelIn/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ // ,{field: 'id', align: 'center',title: ''}
+ ,{field: 'matnr', align: 'center',title: '绌烘《缂栫爜'}
+ ,{field: 'maktx', align: 'center',title: '绌烘《鍚嶇О'}
+ ,{field: 'batch', 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(emptyBarrelIn)', 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(emptyBarrelIn)', 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.id;
+ }));
+ 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 = {
+ 'emptyBarrelIn': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/emptyBarrelIn/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(emptyBarrelIn)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ 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) {
+ let selectList = matXmSelect.getValue()
+ console.log(data.field)
+ if (selectList.size != 0){
+ data.field.matnr = selectList[0].value;
+ }
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/emptyBarrelIn/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(data.field) ,
+ method: 'POST',
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ 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;
+ });
+
+ // 娓叉煋鐗╂枡閫夋嫨
+ var matXmSelect = xmSelect.render({
+ el: '#mat',
+ style: {
+ width: '340px',
+ },
+ autoRow: true,
+ toolbar: { show: true },
+ filterable: true,
+ remoteSearch: true,
+ radio: true,
+ remoteMethod: function(val, cb, show){
+ $.ajax({
+ url: baseUrl+"/mat/all/get/kv",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ condition: val
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ cb(res.data)
+ } else {
+ cb([]);
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ });
+ }
+ })
+
+ $(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+"/emptyBarrelIn/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 () {
+
+ }, 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/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index 863b89f..a2017e7 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -1,5 +1,5 @@
var matCodeLayerIdx;
-var initCountVal = 0;
+var initCountVal = 8;
var matCodeData = [];
function getCol() {
var cols = [
@@ -128,7 +128,7 @@
// 鑾峰彇鍙敤鍏ュ簱绔欑偣
function getInBound() {
$.ajax({
- url: baseUrl + "/available/put/site",
+ url: baseUrl + "/available/put/site5",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
diff --git a/src/main/webapp/views/emptyBarrelIn/emptyBarrelIn.html b/src/main/webapp/views/emptyBarrelIn/emptyBarrelIn.html
new file mode 100644
index 0000000..fc9eef1
--- /dev/null
+++ b/src/main/webapp/views/emptyBarrelIn/emptyBarrelIn.html
@@ -0,0 +1,104 @@
+<!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">-->
+<!-- <label class="layui-form-label">缂栧彿:</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="id" 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="emptyBarrelIn" lay-filter="emptyBarrelIn"></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/emptyBarrelIn/emptyBarrelIn.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">ID: </label>
+ <div class="layui-input-block">
+ <input disabled class="layui-input" name="id" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">绌烘《缂栫爜: </label>
+ <div class="layui-input-block">
+ <div id="mat" name="mat">
+ </div>
+<!-- <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="batch" 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>
+
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index 96be64f..757ebbb 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -101,7 +101,7 @@
matQueryTable = table.render({
elem: '#mat',
headers: {token: localStorage.getItem('token')},
- url: baseUrl + '/mat/list/auth',
+ url: baseUrl + '/mat/emptyBucketsList/auth',
page: true,
limit: 7,
limits: [7, 10, 30,50,100],
--
Gitblit v1.9.1