From 2a84609455355cffa099f0f72c8313ac23d7586b Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 17 十月 2024 14:53:46 +0800
Subject: [PATCH] #
---
/dev/null | 342 ---------------------------------------------------------
1 files changed, 0 insertions(+), 342 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/AdjDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/AdjDetlController.java
deleted file mode 100644
index 8831ced..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/AdjDetlController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.AdjDetl;
-import com.zy.asrs.common.wms.service.AdjDetlService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class AdjDetlController extends BaseController {
-
- @Autowired
- private AdjDetlService adjDetlService;
-
- @RequestMapping(value = "/adjDetl/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(adjDetlService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/adjDetl/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<AdjDetl> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(AdjDetl::getAdjId, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(AdjDetl::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(AdjDetl::getAppeTime, DateUtils.convert(range[1]));
- }
- if (!Cools.isEmpty(param.get("loc_no"))) {
- wrapper.like(AdjDetl::getLocNo, param.get("loc_no"));
- }
- if (!Cools.isEmpty(param.get("matnr"))) {
- wrapper.like(AdjDetl::getMatnr, param.get("matnr"));
- }
- return R.ok(adjDetlService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/adjDetl/add/auth")
- @ManagerAuth
- public R add(AdjDetl adjDetl) {
- adjDetlService.save(adjDetl);
- return R.ok();
- }
-
- @RequestMapping(value = "/adjDetl/update/auth")
- @ManagerAuth
- public R update(AdjDetl adjDetl){
- if (Cools.isEmpty(adjDetl) || null==adjDetl.getAdjId()){
- return R.error();
- }
- adjDetlService.updateById(adjDetl);
- return R.ok();
- }
-
- @RequestMapping(value = "/adjDetl/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- adjDetlService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/adjDetlQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<AdjDetl> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(AdjDetl::getAdjId, condition);
- Page<AdjDetl> page = adjDetlService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (AdjDetl adjDetl : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", adjDetl.getAdjId());
- map.put("value", adjDetl.getAdjId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/adjDetl/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<AdjDetl> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(AdjDetl::getAdjId, condition);
- }
- adjDetlService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getAdjId()), item.getAdjId())));
- return R.ok().add(vos);
- }
-
- @RequestMapping(value = "/adjDetl/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- LambdaQueryWrapper<AdjDetl> wrapper = new LambdaQueryWrapper<>();
- Map<String, Object> map = excludeTrash(param.getJSONObject("adjDetl"));
- if (!Cools.isEmpty(map.get("loc_no"))) {
- wrapper.like(AdjDetl::getLocNo, map.get("loc_no"));
- }
- if (!Cools.isEmpty(map.get("matnr"))) {
- wrapper.like(AdjDetl::getMatnr, map.get("matnr"));
- }
- if (!Cools.isEmpty(map.get("modi_time"))) {
- String[] range = map.get("modi_time").toString().split(RANGE_TIME_LINK);
- wrapper.ge(AdjDetl::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(AdjDetl::getAppeTime, DateUtils.convert(range[1]));
- }
- List<AdjDetl> list = adjDetlService.list(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasBarcodeController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasBarcodeController.java
deleted file mode 100644
index 02c8b3c..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasBarcodeController.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.BasBarcode;
-import com.zy.asrs.common.wms.service.BasBarcodeService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class BasBarcodeController extends BaseController {
-
- @Autowired
- private BasBarcodeService basBarcodeService;
-
- @RequestMapping(value = "/basBarcode/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(basBarcodeService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/basBarcode/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<BasBarcode> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(BasBarcode::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(BasBarcode::getId, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(BasBarcode::getCreateTime, DateUtils.convert(range[0]));
- wrapper.le(BasBarcode::getCreateTime, DateUtils.convert(range[1]));
- }
- return R.ok(basBarcodeService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/basBarcode/add/auth")
- @ManagerAuth
- public R add(BasBarcode basBarcode) {
- basBarcode.setHostId(getHostId());
- basBarcode.setCreateTime(new Date());
- basBarcodeService.save(basBarcode);
- return R.ok();
- }
-
- @RequestMapping(value = "/basBarcode/update/auth")
- @ManagerAuth
- public R update(BasBarcode basBarcode){
- if (Cools.isEmpty(basBarcode) || null==basBarcode.getId()){
- return R.error();
- }
- basBarcodeService.updateById(basBarcode);
- return R.ok();
- }
-
- @RequestMapping(value = "/basBarcode/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- basBarcodeService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/basBarcodeQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<BasBarcode> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(BasBarcode::getHostId, getHostId());
- wrapper.like(BasBarcode::getId, condition);
- Page<BasBarcode> page = basBarcodeService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (BasBarcode basBarcode : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", basBarcode.getId());
- map.put("value", basBarcode.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/basBarcode/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<BasBarcode> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(BasBarcode::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(BasBarcode::getId, condition);
- }
- basBarcodeService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
- return R.ok().add(vos);
- }
-
- @RequestMapping(value = "/basBarcode/generateBarcode/auth")
- @ManagerAuth
- public R generateBarcode(@RequestParam("barcode") String barcode, @RequestParam("num") Integer num) {
- Long hostId = getHostId();
- Date now = new Date();
- BasBarcode one = basBarcodeService.getOne(new LambdaQueryWrapper<BasBarcode>().eq(BasBarcode::getBarcode, barcode).eq(BasBarcode::getHostId, hostId));
- if (one != null) {
- return R.error("鏉＄爜璧峰鍊煎凡瀛樺湪");
- }
- int barcodeInt = Integer.parseInt(barcode);
- for (int i = 0; i < num; i++) {
- BasBarcode basBarcode = new BasBarcode();
- basBarcode.setBarcode(String.valueOf(barcodeInt));
- basBarcode.setHostId(hostId);
- basBarcode.setCreateTime(now);
- basBarcodeService.save(basBarcode);
- barcodeInt += 1;
- }
- return R.ok();
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasDevpController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasDevpController.java
deleted file mode 100644
index 1c9f4d5..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasDevpController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.BasDevp;
-import com.zy.asrs.common.wms.service.BasDevpService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.BaseRes;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class BasDevpController extends BaseController {
-
- @Autowired
- private BasDevpService basDevpService;
-
- @RequestMapping(value = "/basDevp/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(basDevpService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/basDevp/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<BasDevp> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(BasDevp::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(BasDevp::getDevNo, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(BasDevp::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(BasDevp::getAppeTime, DateUtils.convert(range[1]));
- }
- return R.ok(basDevpService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/basDevp/add/auth")
- @ManagerAuth
- public R add(BasDevp basDevp) {
- basDevp.setHostId(getHostId());
- basDevpService.save(basDevp);
- return R.ok();
- }
-
- @RequestMapping(value = "/basDevp/update/auth")
- @ManagerAuth
- public R update(BasDevp basDevp){
- if (Cools.isEmpty(basDevp) || null==basDevp.getDevNo()){
- return R.error();
- }
- basDevpService.updateById(basDevp);
- return R.ok();
- }
-
- @RequestMapping(value = "/basDevp/delete/auth")
- @ManagerAuth(memo = "绔欑偣鍒犻櫎")
- public R delete(@RequestParam String param){
- List<BasDevp> list = JSONArray.parseArray(param, BasDevp.class);
- if (Cools.isEmpty(list)){
- return R.error();
- }
- for (BasDevp entity : list){
- basDevpService.remove(new LambdaQueryWrapper<>(entity).eq(BasDevp::getHostId, getHostId()));
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/basDevpQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<BasDevp> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(BasDevp::getHostId, getHostId());
- wrapper.like(BasDevp::getDevNo, condition);
- Page<BasDevp> page = basDevpService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (BasDevp basDevp : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", basDevp.getDevNo());
- map.put("value", basDevp.getDevNo());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/basDevp/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<BasDevp> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(BasDevp::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(BasDevp::getDevNo, condition);
- }
- basDevpService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getDevNo()), item.getDevNo().longValue())));
- return R.ok().add(vos);
- }
-
- @RequestMapping(value = "/basDevp/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- LambdaQueryWrapper<BasDevp> wrapper = new LambdaQueryWrapper<BasDevp>().eq(BasDevp::getDevNo, param.get("val"));
- if (null != basDevpService.getOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(BasDevp.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasLocStsController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasLocStsController.java
deleted file mode 100644
index 0e5d3ca..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasLocStsController.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.BasLocSts;
-import com.zy.asrs.common.wms.service.BasLocStsService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class BasLocStsController extends BaseController {
-
- @Autowired
- private BasLocStsService basLocStsService;
-
- @RequestMapping(value = "/basLocSts/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(basLocStsService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/basLocSts/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<BasLocSts> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(BasLocSts::getLocDesc, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(BasLocSts::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(BasLocSts::getAppeTime, DateUtils.convert(range[1]));
- }
- if (!Cools.isEmpty(param.get("loc_sts"))) {
- wrapper.eq(BasLocSts::getLocSts, param.get("loc_sts"));
- }
- return R.ok(basLocStsService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/basLocSts/add/auth")
- @ManagerAuth
- public R add(BasLocSts basLocSts) {
- basLocStsService.save(basLocSts);
- return R.ok();
- }
-
- @RequestMapping(value = "/basLocSts/update/auth")
- @ManagerAuth
- public R update(BasLocSts basLocSts){
- if (Cools.isEmpty(basLocSts) || null==basLocSts.getLocSts()){
- return R.error();
- }
- basLocStsService.updateById(basLocSts);
- return R.ok();
- }
-
- @RequestMapping(value = "/basLocSts/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") String[] ids){
- for (String id : ids){
- basLocStsService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/basLocStsQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<BasLocSts> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(BasLocSts::getLocDesc, condition);
- Page<BasLocSts> page = basLocStsService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (BasLocSts basLocSts : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", basLocSts.getLocSts());
- map.put("value", basLocSts.getLocDesc());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/basLocSts/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<BasLocSts> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(BasLocSts::getLocDesc, condition);
- }
- basLocStsService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getLocDesc()), Long.parseLong(item.getLocSts()))));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWhsController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWhsController.java
deleted file mode 100644
index a201dd6..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWhsController.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.BasWhs;
-import com.zy.asrs.common.wms.service.BasWhsService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class BasWhsController extends BaseController {
-
- @Autowired
- private BasWhsService basWhsService;
-
- @RequestMapping(value = "/basWhs/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(basWhsService.getOne(new LambdaQueryWrapper<BasWhs>().eq(BasWhs::getId, Long.parseLong(id)).eq(BasWhs::getHostId, getHostId())));
- }
-
- @RequestMapping(value = "/basWhs/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<BasWhs> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(BasWhs::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(BasWhs::getWhsDesc, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(BasWhs::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(BasWhs::getAppeTime, DateUtils.convert(range[1]));
- }
- return R.ok(basWhsService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/basWhs/add/auth")
- @ManagerAuth
- public R add(BasWhs basWhs) {
- basWhs.setHostId(getHostId());
- basWhsService.save(basWhs);
- return R.ok();
- }
-
- @RequestMapping(value = "/basWhs/update/auth")
- @ManagerAuth
- public R update(BasWhs basWhs){
- if (Cools.isEmpty(basWhs) || null==basWhs.getId()){
- return R.error();
- }
- basWhsService.updateById(basWhs);
- return R.ok();
- }
-
- @RequestMapping(value = "/basWhs/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- basWhsService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/basWhsQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<BasWhs> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(BasWhs::getHostId, getHostId());
- wrapper.like(BasWhs::getWhsDesc, condition);
- Page<BasWhs> page = basWhsService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (BasWhs basWhs : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", basWhs.getId());
- map.put("value", basWhs.getWhsDesc());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/basWhs/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<BasWhs> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(BasWhs::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(BasWhs::getWhsDesc, condition);
- }
- basWhsService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getWhsDesc()), item.getId())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWrkIotypeController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWrkIotypeController.java
deleted file mode 100644
index 1e45ecf..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWrkIotypeController.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.BasLocSts;
-import com.zy.asrs.common.wms.entity.BasWrkIotype;
-import com.zy.asrs.common.wms.service.BasWrkIotypeService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class BasWrkIotypeController extends BaseController {
-
- @Autowired
- private BasWrkIotypeService basWrkIotypeService;
-
- @RequestMapping(value = "/basWrkIotype/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(basWrkIotypeService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/basWrkIotype/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<BasWrkIotype> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(BasWrkIotype::getIoDesc, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(BasWrkIotype::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(BasWrkIotype::getAppeTime, DateUtils.convert(range[1]));
- }
- if (!Cools.isEmpty(param.get("io_type"))) {
- wrapper.eq(BasWrkIotype::getIoType, param.get("io_type"));
- }
- return R.ok(basWrkIotypeService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/basWrkIotype/add/auth")
- @ManagerAuth
- public R add(BasWrkIotype basWrkIotype) {
- basWrkIotypeService.save(basWrkIotype);
- return R.ok();
- }
-
- @RequestMapping(value = "/basWrkIotype/update/auth")
- @ManagerAuth
- public R update(BasWrkIotype basWrkIotype){
- if (Cools.isEmpty(basWrkIotype) || null==basWrkIotype.getIoType()){
- return R.error();
- }
- basWrkIotypeService.updateById(basWrkIotype);
- return R.ok();
- }
-
- @RequestMapping(value = "/basWrkIotype/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- basWrkIotypeService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/basWrkIotypeQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<BasWrkIotype> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(BasWrkIotype::getIoDesc, condition);
- Page<BasWrkIotype> page = basWrkIotypeService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (BasWrkIotype basWrkIotype : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", basWrkIotype.getIoType());
- map.put("value", basWrkIotype.getIoDesc());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/basWrkIotype/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<BasWrkIotype> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(BasWrkIotype::getIoDesc, condition);
- }
- basWrkIotypeService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getIoDesc()), item.getIoType().longValue())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWrkStatusController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWrkStatusController.java
deleted file mode 100644
index d43ad00..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWrkStatusController.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.BasWrkIotype;
-import com.zy.asrs.common.wms.entity.BasWrkStatus;
-import com.zy.asrs.common.wms.service.BasWrkStatusService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class BasWrkStatusController extends BaseController {
-
- @Autowired
- private BasWrkStatusService basWrkStatusService;
-
- @RequestMapping(value = "/basWrkStatus/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(basWrkStatusService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/basWrkStatus/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<BasWrkStatus> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(BasWrkStatus::getWrkDesc, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(BasWrkStatus::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(BasWrkStatus::getAppeTime, DateUtils.convert(range[1]));
- }
- if (!Cools.isEmpty(param.get("wrk_sts"))) {
- wrapper.eq(BasWrkStatus::getWrkSts, param.get("wrk_sts"));
- }
- return R.ok(basWrkStatusService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/basWrkStatus/add/auth")
- @ManagerAuth
- public R add(BasWrkStatus basWrkStatus) {
- basWrkStatusService.save(basWrkStatus);
- return R.ok();
- }
-
- @RequestMapping(value = "/basWrkStatus/update/auth")
- @ManagerAuth
- public R update(BasWrkStatus basWrkStatus){
- if (Cools.isEmpty(basWrkStatus) || null==basWrkStatus.getWrkSts()){
- return R.error();
- }
- basWrkStatusService.updateById(basWrkStatus);
- return R.ok();
- }
-
- @RequestMapping(value = "/basWrkStatus/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- basWrkStatusService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/basWrkStatusQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<BasWrkStatus> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(BasWrkStatus::getWrkDesc, condition);
- Page<BasWrkStatus> page = basWrkStatusService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (BasWrkStatus basWrkStatus : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", basWrkStatus.getWrkSts());
- map.put("value", basWrkStatus.getWrkDesc());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/basWrkStatus/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<BasWrkStatus> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(BasWrkStatus::getWrkDesc, condition);
- }
- basWrkStatusService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getWrkDesc()), item.getWrkSts())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/CstmrController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/CstmrController.java
deleted file mode 100644
index bc1abc2..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/CstmrController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.Cstmr;
-import com.zy.asrs.common.wms.service.CstmrService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class CstmrController extends BaseController {
-
- @Autowired
- private CstmrService cstmrService;
-
- @RequestMapping(value = "/cstmr/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(cstmrService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/cstmr/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<Cstmr> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(Cstmr::getId, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(Cstmr::getCreateTime, DateUtils.convert(range[0]));
- wrapper.le(Cstmr::getCreateTime, DateUtils.convert(range[1]));
- }
- return R.ok(cstmrService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/cstmr/add/auth")
- @ManagerAuth
- public R add(Cstmr cstmr) {
- cstmrService.save(cstmr);
- return R.ok();
- }
-
- @RequestMapping(value = "/cstmr/update/auth")
- @ManagerAuth
- public R update(Cstmr cstmr){
- if (Cools.isEmpty(cstmr) || null==cstmr.getId()){
- return R.error();
- }
- cstmrService.updateById(cstmr);
- return R.ok();
- }
-
- @RequestMapping(value = "/cstmr/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- cstmrService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/cstmrQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<Cstmr> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(Cstmr::getId, condition);
- Page<Cstmr> page = cstmrService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (Cstmr cstmr : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", cstmr.getId());
- map.put("value", cstmr.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/cstmr/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<Cstmr> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(Cstmr::getId, condition);
- }
- cstmrService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/DocTypeController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/DocTypeController.java
deleted file mode 100644
index b3a12fe..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/DocTypeController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.DocType;
-import com.zy.asrs.common.wms.service.DocTypeService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class DocTypeController extends BaseController {
-
- @Autowired
- private DocTypeService docTypeService;
-
- @RequestMapping(value = "/docType/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") Long id) {
- return R.ok(docTypeService.getById(id));
- }
-
- @RequestMapping(value = "/docType/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<DocType> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(DocType::getDocName, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(DocType::getCreateTime, DateUtils.convert(range[0]));
- wrapper.le(DocType::getCreateTime, DateUtils.convert(range[1]));
- }
- return R.ok(docTypeService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/docType/add/auth")
- @ManagerAuth
- public R add(DocType docType) {
- docTypeService.save(docType);
- return R.ok();
- }
-
- @RequestMapping(value = "/docType/update/auth")
- @ManagerAuth
- public R update(DocType docType){
- if (Cools.isEmpty(docType) || null==docType.getDocId()){
- return R.error();
- }
- docTypeService.updateById(docType);
- return R.ok();
- }
-
- @RequestMapping(value = "/docType/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- docTypeService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/docTypeQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<DocType> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(DocType::getDocName, condition);
- Page<DocType> page = docTypeService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (DocType docType : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", docType.getDocId());
- map.put("value", docType.getDocName());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/docType/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<DocType> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(DocType::getDocName, condition);
- }
- docTypeService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getDocName()), item.getDocId())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ItemController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ItemController.java
deleted file mode 100644
index e52edc4..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ItemController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.Item;
-import com.zy.asrs.common.wms.service.ItemService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class ItemController extends BaseController {
-
- @Autowired
- private ItemService itemService;
-
- @RequestMapping(value = "/item/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(itemService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/item/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<Item> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(Item::getId, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(Item::getCreateTime, DateUtils.convert(range[0]));
- wrapper.le(Item::getCreateTime, DateUtils.convert(range[1]));
- }
- return R.ok(itemService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/item/add/auth")
- @ManagerAuth
- public R add(Item item) {
- itemService.save(item);
- return R.ok();
- }
-
- @RequestMapping(value = "/item/update/auth")
- @ManagerAuth
- public R update(Item item){
- if (Cools.isEmpty(item) || null==item.getId()){
- return R.error();
- }
- itemService.updateById(item);
- return R.ok();
- }
-
- @RequestMapping(value = "/item/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- itemService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/itemQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<Item> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(Item::getId, condition);
- Page<Item> page = itemService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (Item item : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", item.getId());
- map.put("value", item.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/item/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<Item> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(Item::getId, condition);
- }
- itemService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
deleted file mode 100644
index 5d3bb49..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.LocDetl;
-import com.zy.asrs.common.wms.entity.Mat;
-import com.zy.asrs.common.wms.service.LocDetlService;
-import com.zy.asrs.common.wms.service.MatService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class LocDetlController extends BaseController {
-
- @Autowired
- private LocDetlService locDetlService;
- @Autowired
- private MatService matService;
-
- @RequestMapping(value = "/locDetl/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(locDetlService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/locDetl/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<LocDetl> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LocDetl::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(LocDetl::getLocNo, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(LocDetl::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(LocDetl::getAppeTime, DateUtils.convert(range[1]));
- }
- if (!Cools.isEmpty(param.get("locNo"))) {
- wrapper.eq(LocDetl::getLocNo, param.get("locNo"));
- }
- return R.ok(locDetlService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/locDetl/add/auth")
- @ManagerAuth
- public R add(LocDetl locDetl) {
- locDetl.setHostId(getHostId());
- locDetlService.save(locDetl);
- return R.ok();
- }
-
- @RequestMapping(value = "/locDetl/update/auth")
- @ManagerAuth
- public R update(LocDetl locDetl){
- if (Cools.isEmpty(locDetl) || null==locDetl.getLocNo()){
- return R.error();
- }
- locDetlService.updateById(locDetl);
- return R.ok();
- }
-
- @RequestMapping(value = "/locDetl/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- locDetlService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/locDetlQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<LocDetl> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LocDetl::getHostId, getHostId());
- wrapper.like(LocDetl::getLocNo, condition);
- Page<LocDetl> page = locDetlService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (LocDetl locDetl : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", locDetl.getLocNo());
- map.put("value", locDetl.getLocNo());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/locDetl/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<LocDetl> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LocDetl::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(LocDetl::getLocNo, condition);
- }
- locDetlService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getLocNo()), Long.parseLong(item.getLocNo()))));
- return R.ok().add(vos);
- }
-
- @RequestMapping(value = "/locDetl/statis/auth")
- @ManagerAuth
- public R statis(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param) {
- IPage<LocDetl> stockStatis = locDetlService.getStockStatis(curr, limit, param);
- for (LocDetl locDetl : stockStatis.getRecords()) {
- Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>()
- .eq(Mat::getMatnr, locDetl.getMatnr())
- .eq(Mat::getHostId, getHostId()));
- if (mat != null) {
- locDetl.sync(mat);
- }
- }
- return R.ok().add(stockStatis);
- }
-
- /**
- * 鑾峰彇搴撳瓨鎬绘暟
- * @return
- */
- @RequestMapping("/locDetl/count")
- public R getAllCount(){
- Integer sum = locDetlService.sum();
- return R.ok(sum);
- }
-
- @RequestMapping(value = "/stock/out/list/auth")
- @ManagerAuth
- public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- if (!Cools.isEmpty(param.get("modi_time"))){
- String val = String.valueOf(param.get("modi_time"));
- if (val.contains(RANGE_TIME_LINK)) {
- String[] dates = val.split(RANGE_TIME_LINK);
- param.put("startTime", DateUtils.convert(dates[0]));
- param.put("endTime", DateUtils.convert(dates[1]));
- param.remove("modi_time");
- }
- }
- param.put("hostId", getHostId());
- return R.ok(locDetlService.getStockOut(curr, limit, param));
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
deleted file mode 100644
index 194311c..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.domain.entity.Parameter;
-import com.zy.asrs.common.domain.entity.Shelves;
-import com.zy.asrs.common.domain.param.LocMastInitParam;
-import com.zy.asrs.common.wms.entity.LocDetl;
-import com.zy.asrs.common.wms.entity.LocMast;
-import com.zy.asrs.common.wms.service.LocDetlService;
-import com.zy.asrs.common.wms.service.LocMastService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.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.*;
-
-@RestController
-public class LocMastController extends BaseController {
-
- @Autowired
- private LocMastService locMastService;
- @Autowired
- private LocDetlService locDetlService;
-
- @RequestMapping(value = "/locMast/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, id).eq(LocMast::getHostId, getHostId())));
- }
-
- @RequestMapping(value = "/locMast/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<LocMast> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LocMast::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(LocMast::getLocNo, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(LocMast::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(LocMast::getAppeTime, DateUtils.convert(range[1]));
- }
- if (!Cools.isEmpty(param.get("loc_no"))) {
- wrapper.eq(LocMast::getLocNo, param.get("loc_no"));
- }
- return R.ok(locMastService.page(new Page<>(curr, limit), wrapper));
- }
-
- @PostMapping(value = "/group/empty/stock")
- @ManagerAuth(memo = "鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅")
- public R getGroupEmptyStock(@RequestParam(required = false) String sourceLocNo) {
- return R.ok().add(locMastService.queryGroupEmptyStock(sourceLocNo, getHostId()));
- }
-
-
- @RequestMapping(value = "/locMast/add/auth")
- @ManagerAuth
- public R add(LocMast locMast) {
- locMast.setHostId(getHostId());
- locMastService.save(locMast);
- return R.ok();
- }
-
- @RequestMapping(value = "/locMast/update/auth")
- @ManagerAuth
- public R update(LocMast locMast){
- if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
- return R.error();
- }
- locMastService.updateById(locMast);
- return R.ok();
- }
-
- @RequestMapping(value = "/locMast/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- locMastService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/locMastQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<LocMast> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LocMast::getHostId, getHostId());
- wrapper.like(LocMast::getLocNo, condition);
- Page<LocMast> page = locMastService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (LocMast locMast : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", locMast.getLocNo());
- map.put("value", locMast.getLocNo());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/locMast/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<LocMast> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LocMast::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(LocMast::getLocNo, condition);
- }
- locMastService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getLocNo()), Long.parseLong(item.getLocNo()))));
- return R.ok().add(vos);
- }
-
- @RequestMapping(value = "/locMast/init/pwd")
- public R locMastInitPwd(@RequestParam(required = false) String pwd) {
- if (Cools.isEmpty(pwd)) {
- return R.error("璇疯緭鍏ュ彛浠�");
- }
- return R.ok().add(Parameter.get().getLocMastInitPwd().equals(pwd));
- }
-
- @RequestMapping(value = "/locMast/init/auth")
- @ManagerAuth(memo = "鍒濆鍖栧簱浣�")
- @Transactional
- public R init(LocMastInitParam param) {
- Long hostId = getHostId();
- List<LocMast> list = new ArrayList<>();
- for (int r=param.getStartRow(); r<=param.getEndRow(); r++){
- for (int b=param.getStartBay(); b<=param.getEndBay(); b++) {
- for (int l=param.getStartLev(); l<=param.getEndLev(); l++) {
- // 鑾峰彇搴撲綅鍙�
- String locNo = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l);
- // 鑾峰彇鍫嗗灈鏈哄彿
- int crnNo = 0;
- Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount());
- for (List<Integer> node : shelves.nodes){
- if (node.contains(r)) {
- crnNo = shelves.nodes.indexOf(node) + 1;
- break;
- }
- }
- LocMast locMast = new LocMast();
- locMast.setLocNo(locNo);
- locMast.setLocSts("O");
- locMast.setRow1(r); // 鎺�
- locMast.setBay1(b); // 鍒�
- locMast.setLev1(l); // 灞�
- locMast.setCrnNo(crnNo); // 鍫嗗灈鏈�
- locMast.setLocType1(param.getLocType1());
- locMast.setLocType2(param.getLocType2());
- locMast.setLocType3(param.getLocType3());
- locMast.setAppeUser(getUserId());
- locMast.setAppeTime(new Date());
- locMast.setModiUser(getUserId());
- locMast.setModiTime(new Date());
- locMast.setHostId(hostId);
- list.add(locMast);
- }
- }
- }
- locMastService.remove(new LambdaQueryWrapper<LocMast>().eq(LocMast::getHostId, hostId));
- locDetlService.remove(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getHostId, hostId));
- for (LocMast locMast : list) {
- locMastService.save(locMast);
- }
- return R.ok("鍒濆鍖栨垚鍔�");
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocRuleController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocRuleController.java
deleted file mode 100644
index 0d6d122..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocRuleController.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.LocRule;
-import com.zy.asrs.common.wms.service.LocRuleService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class LocRuleController extends BaseController {
-
- @Autowired
- private LocRuleService locRuleService;
-
- @RequestMapping(value = "/locRule/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(locRuleService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/locRule/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<LocRule> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LocRule::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(LocRule::getId, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(LocRule::getCreateTime, DateUtils.convert(range[0]));
- wrapper.le(LocRule::getCreateTime, DateUtils.convert(range[1]));
- }
- return R.ok(locRuleService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/locRule/add/auth")
- @ManagerAuth
- public R add(LocRule locRule) {
- locRule.setHostId(getHostId());
- locRuleService.save(locRule);
- return R.ok();
- }
-
- @RequestMapping(value = "/locRule/update/auth")
- @ManagerAuth
- public R update(LocRule locRule){
- if (Cools.isEmpty(locRule) || null==locRule.getId()){
- return R.error();
- }
- locRuleService.updateById(locRule);
- return R.ok();
- }
-
- @RequestMapping(value = "/locRule/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- locRuleService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/locRuleQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<LocRule> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LocRule::getHostId, getHostId());
- wrapper.like(LocRule::getId, condition);
- Page<LocRule> page = locRuleService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (LocRule locRule : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", locRule.getId());
- map.put("value", locRule.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/locRule/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<LocRule> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LocRule::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(LocRule::getId, condition);
- }
- locRuleService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MapController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MapController.java
deleted file mode 100644
index 71cec8c..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MapController.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.utils.Utils;
-import com.zy.asrs.common.web.BaseController;
-import com.zy.asrs.common.wms.entity.BasMap;
-import com.zy.asrs.common.wms.entity.LocDetl;
-import com.zy.asrs.common.wms.entity.LocMast;
-import com.zy.asrs.common.wms.service.BasMapService;
-import com.zy.asrs.common.wms.service.LocDetlService;
-import com.zy.asrs.common.wms.service.LocMastService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-@RestController
-
-public class MapController extends BaseController {
-
- @Autowired
- private LocMastService locMastService;
- @Autowired
- private LocDetlService locDetlService;
- @Autowired
- private BasMapService basMapService;
-
- private static final List<String> DISABLE_LOC_NO = new ArrayList<String>() {{
-// add("0200101");
- }};
-
- @GetMapping("/map/getData/{lev}/auth")
- @ManagerAuth
- public String getMapData(@PathVariable("lev") Integer lev) {
- BasMap basMap = basMapService.getOne(new LambdaQueryWrapper<BasMap>().eq(BasMap::getLev, lev).eq(BasMap::getHostId, getHostId()));
- //瑙ｆ瀽json鍦板浘鏁版嵁
- List<ArrayList> arrayLists = JSON.parseArray(basMap.getData(), ArrayList.class);
- ArrayList<HashMap<String, Integer>> lineRows = new ArrayList<>();
- int dataRow = 0;
- int dataRowCount = 0;
- for (int i = 1; i < arrayLists.size(); i++) {
- boolean flag = true;
- ArrayList rows = arrayLists.get(i);
- for (int j = 1; j < rows.size() - 1; j++) {
- Object o = rows.get(j);
- JSONObject jsonObject = JSON.parseObject(o.toString());
- int value = Integer.parseInt(jsonObject.get("value").toString());
- if (value >= 0 && value != 3) {
- //鍙湁璇ヨ涓殑浠讳竴涓�鍒楁湁鏁版嵁锛屽垯涓嶉渶瑕佸垱寤虹┖鐧借
- flag = false;
- }
- }
-
- if (flag) {
- //绌虹櫧琛岄渶瑕佽烦杩�
- HashMap<String, Integer> map = new HashMap<>();
- map.put("start", dataRow);
- int end = i - 1 - dataRowCount;
- map.put("end", end);
- map.put("count", dataRowCount);
- dataRow = end;
- dataRowCount++;
- lineRows.add(map);
- }
- }
-
- //鑾峰彇褰撳墠妤煎眰搴撲綅鏁版嵁
- List<LocMast> locMasts = locMastService.list(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLev1, lev).eq(LocMast::getHostId, getHostId()));
- for (LocMast locMast : locMasts) {
- Integer row = locMast.getRow1();
- Integer bay = locMast.getBay1();
- for (HashMap<String, Integer> lineRow : lineRows) {
- if (row > lineRow.get("start") && row <= lineRow.get("end")) {
- row += lineRow.get("count");
- break;
- }
- }
- ArrayList rowData = arrayLists.get(row);
- Object o = rowData.get(bay);
- JSONObject jsonObject = JSON.parseObject(o.toString());
- if (DISABLE_LOC_NO.contains(locMast.getLocNo())) {
- //绂佹搴撲綅
- jsonObject.put("value", 10);//灏嗙鐢ㄥ簱浣嶈繘琛岃缃�
- }
- jsonObject.put("locNo", locMast.getLocNo());//璁剧疆搴撲綅鍙�
- jsonObject.put("locSts", locMast.getLocSts());//搴撲綅鐘舵��
-
- jsonObject.put("lockLocMast", locMast.getLocType3$());
- jsonObject.put("batch", "");//鎵瑰彿
- jsonObject.put("barcode", "");//鏉＄爜鍙�
- if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("R")) {
- List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo, locMast.getLocNo()).eq(LocDetl::getHostId, getHostId()));
- if (!locDetls.isEmpty()) {
- LocDetl locDetl = locDetls.get(0);
- jsonObject.put("batch", locDetl.getBatch());//鎵瑰彿
- jsonObject.put("barcode", locDetl.getBarcode());//鏉＄爜鍙�
- }
- }
-
- //鏇存柊list
- rowData.set(bay, jsonObject);
- arrayLists.set(row, rowData);
- }
-
- return JSONObject.toJSONString(arrayLists);
- }
-
- @RequestMapping("/map/searchData/auth")
- @ManagerAuth
- public R searchLoc(@RequestParam("lev") Integer lev,
- @RequestParam("locNo") String locNo,
- @RequestParam("orderNo") String orderNo,
- @RequestParam("specs") String specs,
- @RequestParam("matnr") String matnr,
- @RequestParam("maktx") String maktx
- ) {
- LambdaQueryWrapper<LocDetl> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(orderNo)) {
- wrapper.like(LocDetl::getOrderNo, orderNo);
- }
- if (!Cools.isEmpty(matnr)) {
- wrapper.like(LocDetl::getMatnr, matnr);
- }
- if (!Cools.isEmpty(maktx)) {
- wrapper.like(LocDetl::getMaktx, maktx);
- }
- if (!Cools.isEmpty(specs)) {
- wrapper.like(LocDetl::getSpecs, specs);
- }
- List<LocDetl> locDetls = locDetlService.list(wrapper);
- ArrayList<LocDetl> lists = new ArrayList<>();
- for (LocDetl locDetl : locDetls) {//杩囨护鎺変笉鏄綋鍓嶆ゼ灞傜殑鏁版嵁
- int lev1 = Utils.getLev(locDetl.getLocNo());
- if (lev1 == lev) {
- lists.add(locDetl);
- }
- }
-
- //鎼滅储鎸囧畾搴撲綅鍙凤紝鍗充娇搴撲綅涓虹┖锛屼篃鍙互杩斿洖鏁版嵁
- LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, locNo).eq(LocMast::getHostId, getHostId()));
- if (locMast != null) {
- LocDetl locDetl = new LocDetl();
- locDetl.setLocNo(locMast.getLocNo());
- lists.add(locDetl);
- }
- return R.ok().add(lists);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatCodeController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatCodeController.java
deleted file mode 100644
index 7d6f997..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatCodeController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.MatCode;
-import com.zy.asrs.common.wms.service.MatCodeService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class MatCodeController extends BaseController {
-
- @Autowired
- private MatCodeService matCodeService;
-
- @RequestMapping(value = "/matCode/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(matCodeService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/matCode/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<MatCode> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(MatCode::getMatNo, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(MatCode::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(MatCode::getAppeTime, DateUtils.convert(range[1]));
- }
- return R.ok(matCodeService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/matCode/add/auth")
- @ManagerAuth
- public R add(MatCode matCode) {
- matCodeService.save(matCode);
- return R.ok();
- }
-
- @RequestMapping(value = "/matCode/update/auth")
- @ManagerAuth
- public R update(MatCode matCode){
- if (Cools.isEmpty(matCode) || null==matCode.getMatNo()){
- return R.error();
- }
- matCodeService.updateById(matCode);
- return R.ok();
- }
-
- @RequestMapping(value = "/matCode/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- matCodeService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/matCodeQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<MatCode> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(MatCode::getMatNo, condition);
- Page<MatCode> page = matCodeService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (MatCode matCode : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", matCode.getMatNo());
- map.put("value", matCode.getMatNo());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/matCode/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<MatCode> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(MatCode::getMatNo, condition);
- }
- matCodeService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getMatNo()), Long.parseLong(item.getMatNo()))));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
deleted file mode 100644
index 1a463ae..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.utils.TreeUtils;
-import com.zy.asrs.common.wms.entity.Mat;
-import com.zy.asrs.common.wms.entity.OrderDetl;
-import com.zy.asrs.common.wms.service.MatService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import com.zy.asrs.framework.exception.CoolException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class MatController extends BaseController {
-
- @Autowired
- private MatService matService;
- @Autowired
- private TreeUtils treeUtils;
-
- @RequestMapping(value = "/mat/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") Long id) {
- return R.ok(matService.getById(id));
- }
-
- @RequestMapping(value = "/mat/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Mat::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(Mat::getId, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(Mat::getCreateTime, DateUtils.convert(range[0]));
- wrapper.le(Mat::getCreateTime, DateUtils.convert(range[1]));
- }
- Object tagId = param.get("tag_id");
- ArrayList<Long> nodes = new ArrayList<>();
- if (Cools.isEmpty(tagId)) {
- tagId = getOriginTag().getId();
- }
- treeUtils.getTagIdList(Long.parseLong(tagId.toString()), nodes);
- wrapper.in(Mat::getTagId, nodes);
- if (!Cools.isEmpty(param.get("matnr"))) {
- wrapper.eq(Mat::getMatnr, param.get("matnr"));
- }
- if (!Cools.isEmpty(param.get("maktx"))) {
- wrapper.eq(Mat::getMaktx, param.get("maktx"));
- }
- return R.ok(matService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/mat/add/auth")
- @ManagerAuth
- public R add(Mat mat) {
- mat.setHostId(getHostId());
- matService.save(mat);
- return R.ok();
- }
-
- @RequestMapping(value = "/mat/update/auth")
- @ManagerAuth
- public R update(Mat mat){
- if (Cools.isEmpty(mat) || null== mat.getId()){
- return R.error();
- }
- matService.updateById(mat);
- return R.ok();
- }
-
- @RequestMapping(value = "/mat/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam String param){
- List<Mat> list = JSONArray.parseArray(param, Mat.class);
- if (Cools.isEmpty(list)){
- return R.error();
- }
- for (Mat entity : list){
- if (!matService.remove(new LambdaQueryWrapper<>(entity))) {
- throw new CoolException("鍒犻櫎澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/matQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(Mat::getId, condition);
- wrapper.eq(Mat::getHostId, getHostId());
- Page<Mat> page = matService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (Mat mat : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", mat.getId());
- map.put("value", mat.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/mat/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Mat::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(Mat::getMatnr, condition);
- }
- matService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(item.getMatnr(), item.getId())));
- return R.ok().add(vos);
- }
-
- @RequestMapping(value = "/mat/covert/{id}/auth")
- @ManagerAuth
- public R covert(@PathVariable("id") String id) {
- Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getId, id).eq(Mat::getHostId, getHostId()));
- if (mat == null) {
- return R.ok();
- }
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
- orderDetl.setAnfme(0.0D);
- return R.ok().add(orderDetl);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
deleted file mode 100644
index 979c419..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
+++ /dev/null
@@ -1,269 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.domain.dto.WrkDto;
-import com.zy.asrs.common.domain.entity.MobileAdjustResult;
-import com.zy.asrs.common.domain.param.MobileAdjustParam;
-import com.zy.asrs.common.openapi.entity.param.CombParam;
-import com.zy.asrs.common.web.BaseController;
-import com.zy.asrs.common.wms.entity.*;
-import com.zy.asrs.common.wms.service.*;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.exception.CoolException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-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.*;
-
-/**
- * 绉诲姩绔帴鍙ｆ帶鍒跺櫒
- */
-@RestController
-@RequestMapping("mobile")
-public class MobileController extends BaseController {
-
- @Autowired
- private MobileService mobileService;
- @Autowired
- private OrderService orderService;
- @Autowired
- private DocTypeService docTypeService;
- @Autowired
- private WrkDetlService wrkDetlService;
- @Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private LocDetlService locDetlService;
- @Autowired
- private BasDevpService basDevpService;
-
- /**
- * 鏍规嵁鍗曞彿妫�绱㈠崟鎹暟鎹�
- */
- @RequestMapping("/order/search/orderNo/auth")
- @ManagerAuth
- public R orderSearchByBarcode(@RequestParam String orderNo){
- Order order = orderService.selectByNo(orderNo, getHostId());
- if (order == null) {
- return R.ok();
- }
- DocType docType = docTypeService.getById(order.getDocType());
- if (docType.getPakin() == null || docType.getPakin() != 1) {
- return R.ok();
- }
- if (order.getSettle() > 2) {
- return R.ok();
- }
- List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
- if (Cools.isEmpty(orderDetls)) {
- return R.ok();
- }
- return R.ok().add(orderDetls);
- }
-
- @RequestMapping("/comb/auth")
- @ManagerAuth(memo = "缁勬墭")
- public R comb(@RequestBody CombParam combParam){
- mobileService.comb(combParam, getUserId(), getHostId());
- return R.ok("缁勬墭鎴愬姛");
- }
-
- @RequestMapping("/pakout/query/auth")
- @ManagerAuth
- @Deprecated
- public R pakoutQuery(@RequestParam(required = false) String barcode,
- @RequestParam(required = false) Integer staNo,
- @RequestParam(required = false) String matnr){
- if (Cools.isEmpty(barcode) && Cools.isEmpty(matnr)) {
- return R.ok();
- }
- Long hostId = getHostId();
- if (!Cools.isEmpty(barcode)) {
- List<WrkDetl> wrkDetls = wrkDetlService.list(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getZpallet, barcode).eq(WrkDetl::getHostId, hostId));
- return R.ok().add(wrkDetls);
- }
- if (!Cools.isEmpty(matnr)) {
- if (!Cools.isEmpty(staNo)) {
- List<WrkDetl> wrkDetls = wrkDetlService.selectPakoutQuery(staNo, matnr, hostId);
- return R.ok().add(wrkDetls);
- }
- }
- return R.ok();
- }
-
- /**
- * 鍑哄簱纭 - 鎵墭鐩樼爜
- * 1.鍏ㄦ澘 杩斿洖 101
- * 2.鎷ｆ枡 杩斿洖 103
- */
- @RequestMapping("/pakout/confirm/barcode/auth")
- @ManagerAuth
- public R pakoutQueryByBarcode(@RequestParam(required = false) String barcode){
- if (Cools.isEmpty(barcode)) {
- return R.ok();
- }
- Long hostId = getHostId();
- WrkMast wrkMast = wrkMastService.selectByBarcode(barcode, hostId);
- if (wrkMast != null) {
- List<WrkDetl> wrkDetls = wrkDetlService.list(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId));
- // 鍘婚櫎宸插嚭搴撶‘璁ょ殑鏄庣粏
- wrkDetls.removeIf(wrkDetl -> wrkDetl.getInspect() != null && wrkDetl.getInspect() != 0);
- return R.ok().add(Cools.add("wrkNo", wrkMast.getWrkNo()).add("ioType", wrkMast.getIoType()).add("list", wrkDetls));
- }
- return R.ok();
- }
-
- /**
- * 鍑哄簱纭 - 鎷ｆ枡鍑哄簱 - 閫夋嫨鍏蜂綋鏉＄爜鍟嗗搧
- */
- @RequestMapping("/pakout/confirm/pick/auth")
- @ManagerAuth
- public R pakoutQueryByBarcode(@RequestParam(required = false) Integer wrkNo
- , @RequestParam(required = false) String matnr){
- if (Cools.isEmpty(wrkNo)) {
- return R.ok();
- }
- if (Cools.isEmpty(matnr)) {
- return R.ok();
- }
- Long hostId = getHostId();
- WrkMast wrkMast = wrkMastService.getOne(new LambdaQueryWrapper<WrkMast>().eq(WrkMast::getWrkNo, wrkNo).eq(WrkMast::getHostId, hostId));
- if (wrkMast == null) {
- return R.ok();
- }
- String orderNo = null;
- List<WrkDetl> wrkDetls = wrkDetlService.list(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId));
- for (WrkDetl wrkDetl : wrkDetls) {
- if (Cools.isEmpty(orderNo)) {
- orderNo = wrkDetl.getOrderNo();
- }
- if ((wrkDetl.getMatnr() + "-" + wrkDetl.getBatch()).equals(matnr)) {
- return R.ok().add(wrkDetl);
- }
- }
- // 鏇挎崲 鏄庣粏
- List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo, wrkMast.getSourceLocNo()).eq(LocDetl::getHostId, hostId));
- for (LocDetl locDetl : locDetls) {
- if ((locDetl.getMatnr() + "-" + locDetl.getBatch()).equals(matnr)) {
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.sync(locDetl);
- wrkDetl.setOrderNo(orderNo);
- wrkDetl.setIoTime(wrkMast.getIoTime());
- wrkDetl.setWrkNo(wrkNo);
- return R.ok().add(wrkDetl);
- }
- }
- return R.error("绯荤粺閿欒锛屾潯鐮佷笉瀛樺湪");
- }
-
- @RequestMapping("/pakout/confirm/auth")
- @ManagerAuth
- @Transactional
- public R pakoutConfirm(@RequestBody List<WrkDetl> list) {
- if (Cools.isEmpty(list)) {
- return R.ok();
- }
- Long hostId = getHostId();
- Set<Integer> wrkNos = new HashSet<>();
- List<WrkDto> dtos = new ArrayList<>();
- for (WrkDetl wrkDetl : list) {
- if (wrkNos.contains(wrkDetl.getWrkNo())) {
- for (WrkDto dto : dtos) {
- if (dto.getWrkNo().equals(wrkDetl.getWrkNo())) {
- dto.getWrkDetls().add(wrkDetl);
- break;
- }
- }
- } else {
- wrkNos.add(wrkDetl.getWrkNo());
- dtos.add(new WrkDto(wrkDetl.getWrkNo(), wrkDetl));
- }
- }
-
- for (WrkDto dto : dtos) {
- WrkMast wrkMast = wrkMastService.getOne(new LambdaQueryWrapper<WrkMast>().eq(WrkMast::getWrkNo, dto.getWrkNo()).eq(WrkMast::getHostId, hostId));
- if (wrkMast != null) {
- // 101
- if (wrkMast.getIoType() == 101) {
- for (WrkDetl wrkDetl : dto.getWrkDetls()) {
- wrkDetlService.updateInspect(wrkDetl.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), hostId);
- }
- }
- // 103
- if (wrkMast.getIoType() == 103) {
- if (!wrkDetlService.remove(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId))) {
- throw new CoolException("鎷ｆ枡鍑哄簱纭澶辫触");
- }
- for (WrkDetl wrkDetl : dto.getWrkDetls()) {
- wrkDetl.setInspect(1);
- if (!wrkDetlService.save(wrkDetl)) {
- throw new CoolException("鎷ｆ枡鍑哄簱纭澶辫触");
- }
- }
- }
- }
- }
-
- for (Integer wrkNo : wrkNos) {
- WrkMast wrkMast = wrkMastService.getOne(new LambdaQueryWrapper<WrkMast>().eq(WrkMast::getWrkNo, wrkNo).eq(WrkMast::getHostId, hostId));
- if (wrkMast.getWrkSts() == 14 && (Cools.isEmpty(wrkMast.getInvWh()) || wrkMast.getInvWh().equals("N"))) {
- List<WrkDetl> wrkDetls = wrkDetlService.list(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, wrkNo).eq(WrkDetl::getHostId, hostId));
- boolean complete = true;
- for (WrkDetl wrkDetl : wrkDetls) {
- if (wrkDetl.getInspect() == null || wrkDetl.getInspect() == 0) {
- complete = false;
- break;
- }
- }
- if (complete) {
- wrkMast.setInvWh("Y");
- wrkMast.setModiTime(new Date());
- if (!wrkMastService.updateById(wrkMast)) {
- throw new CoolException("淇敼宸ヤ綔妗�" + wrkNo + "澶辫触");
- }
- }
- }
- }
- return R.ok("瀹屾垚纭");
- }
-
- // 鐩樼偣 ----------------------------------------------------------------------------------------------------
-
- @RequestMapping("/checkDetl/auth")
- @ManagerAuth
- public R getCheckDetl(@RequestParam(required = false) Integer staNo) {
- if (null == staNo || staNo == 0) {
- return R.ok();
- }
- Long hostId = getHostId();
- BasDevp basDevp = basDevpService.getOne(new LambdaQueryWrapper<BasDevp>().eq(BasDevp::getDevNo, staNo).eq(BasDevp::getHostId, hostId));
- if (null != basDevp && basDevp.getWrkNo() != null) {
- WrkMast wrkMast = wrkMastService.getOne(new LambdaQueryWrapper<WrkMast>().eq(WrkMast::getWrkNo, basDevp.getWrkNo()).eq(WrkMast::getHostId, hostId));
- if (wrkMast != null && wrkMast.getIoType() == 107) {
- List<WrkDetl> wrkDetls = wrkDetlService.list(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId));
- if (!Cools.isEmpty(wrkDetls)) {
- MobileAdjustResult result = new MobileAdjustResult();
- result.setStaNo(staNo);
- result.setWrkNo(wrkMast.getWrkNo());
- result.setWrkDetls(wrkDetls);
- return R.ok().add(result);
- }
- }
- }
- return R.ok();
- }
-
- @RequestMapping("/adjust/auth")
- @ManagerAuth(memo = "鐩樼偣")
- public R adjust(@RequestBody MobileAdjustParam combParam){
- mobileService.adjust(combParam, getUserId(), getHostId());
- return R.ok("鐩樼偣鎴愬姛");
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/NodeController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/NodeController.java
deleted file mode 100644
index 2077b9c..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/NodeController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.Node;
-import com.zy.asrs.common.wms.service.NodeService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class NodeController extends BaseController {
-
- @Autowired
- private NodeService nodeService;
-
- @RequestMapping(value = "/node/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(nodeService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/node/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<Node> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(Node::getName, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(Node::getCreateTime, DateUtils.convert(range[0]));
- wrapper.le(Node::getCreateTime, DateUtils.convert(range[1]));
- }
- return R.ok(nodeService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/node/add/auth")
- @ManagerAuth
- public R add(Node node) {
- nodeService.save(node);
- return R.ok();
- }
-
- @RequestMapping(value = "/node/update/auth")
- @ManagerAuth
- public R update(Node node){
- if (Cools.isEmpty(node) || null==node.getId()){
- return R.error();
- }
- nodeService.updateById(node);
- return R.ok();
- }
-
- @RequestMapping(value = "/node/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- nodeService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/nodeQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<Node> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(Node::getName, condition);
- Page<Node> page = nodeService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (Node node : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", node.getId());
- map.put("value", node.getName());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/node/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<Node> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(Node::getName, condition);
- }
- nodeService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getName()), item.getId())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
deleted file mode 100644
index 92226a3..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
+++ /dev/null
@@ -1,355 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.domain.dto.DetlDto;
-import com.zy.asrs.common.domain.dto.WrkTraceVo;
-import com.zy.asrs.common.domain.param.OrderDomainParam;
-import com.zy.asrs.common.wms.entity.*;
-import com.zy.asrs.common.wms.service.*;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.common.SnowflakeIdWorker;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import com.zy.asrs.framework.exception.CoolException;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class OrderController extends BaseController {
-
- @Autowired
- private OrderService orderService;
- @Autowired
- private OrderDetlService orderDetlService;
- @Autowired
- private LocDetlService locDetlService;
- @Autowired
- private WrkDetlService wrkDetlService;
- @Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private WrkMastLogService wrkMastLogService;
- @Autowired
- private JdbcTemplate jdbcTemplate;
- @Autowired
- private SnowflakeIdWorker snowflakeIdWorker;
- @Autowired
- private DocTypeService docTypeService;
-
- @RequestMapping(value = "/order/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(orderService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/order/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Order::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(Order::getId, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(Order::getCreateTime, DateUtils.convert(range[0]));
- wrapper.le(Order::getCreateTime, DateUtils.convert(range[1]));
- }
- return R.ok(orderService.page(new Page<>(curr, limit), wrapper));
- }
-
- @RequestMapping(value = "/order/head/page/auth")
- @ManagerAuth
- public R head(@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){
- LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
- excludeTrash(param);
- wrapper.eq(Order::getStatus, 1);
- wrapper.eq(Order::getHostId, getHostId());
- if (!Cools.isEmpty(param.get("order_no"))) {
- wrapper.eq(Order::getOrderNo, param.get("order_no"));
- }
- if (!Cools.isEmpty(param.get("create_time"))) {
- String[] range = param.get("create_time").toString().split(RANGE_TIME_LINK);
- wrapper.ge(Order::getCreateTime, DateUtils.convert(range[0]));
- wrapper.le(Order::getCreateTime, DateUtils.convert(range[1]));
- }
- if (!Cools.isEmpty(param.get("doc_type"))) {
- wrapper.eq(Order::getDocType, param.get("doc_type"));
- }
- if (!Cools.isEmpty(param.get("docName"))) {
- DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocName, param.get("docName")));
- wrapper.eq(Order::getDocType, docType.getDocId());
- }
- if (!Cools.isEmpty(param.get("settle"))) {
- wrapper.eq(Order::getSettle, param.get("settle"));
- }
- return R.ok(orderService.page(new Page<>(curr, limit), wrapper));
- }
-
- @RequestMapping(value = "/order/detl/all/auth")
- @ManagerAuth
- public R head(@RequestParam Long orderId){
- return R.ok().add(orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, orderId).eq(OrderDetl::getHostId, getHostId())));
- }
-
- @RequestMapping(value = "/order/add/auth")
- @ManagerAuth
- public R add(Order order) {
- order.setHostId(getHostId());
- orderService.save(order);
- return R.ok();
- }
-
- @RequestMapping(value = "/order/update/auth")
- @ManagerAuth
- public R update(Order order){
- if (Cools.isEmpty(order) || null==order.getId()){
- return R.error();
- }
- orderService.updateById(order);
- return R.ok();
- }
-
- @RequestMapping(value = "/order/delete/auth")
- @ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
- @Transactional
- public R delete(@RequestParam Long orderId){
- if (!orderService.removeById(orderId)) {
- throw new CoolException("鍒犻櫎鍗曟嵁澶辫触");
- }
- if (!orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, orderId))) {
- throw new CoolException("鍒犻櫎鍗曟嵁鏄庣粏澶辫触");
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/orderQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(Order::getId, condition);
- wrapper.eq(Order::getHostId, getHostId());
- Page<Order> page = orderService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (Order order : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", order.getId());
- map.put("value", order.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/order/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Order::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(Order::getId, condition);
- }
- orderService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
- return R.ok().add(vos);
- }
-
- @PostMapping(value = "/order/wrk/trace/auth")
- @ManagerAuth
- public R orderWrkTrace(@RequestParam("orderId") Long orderId) {
- Long hostId = getHostId();
- Order order = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getId, orderId).eq(Order::getHostId, hostId));
- if (null == order) {
- return R.error("鍗曟嵁涓嶅瓨鍦�");
- }
- // 鏁伴噺缁熻
- List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, orderId).eq(OrderDetl::getHostId, hostId));
- double totalQty = 0;
- double wrkQty = 0;
- double lackQty = 0;
- for (OrderDetl orderDetl : orderDetls) {
- totalQty = totalQty + orderDetl.getAnfme();
- wrkQty = wrkQty + orderDetl.getQty();
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
- if (issued > 0.0) {
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), hostId);
- for (LocDetl locDetl : locDetls) {
- if (issued > 0) {
- issued = issued - locDetl.getAnfme();
- } else {
- break;
- }
- }
- }
- if (issued > 0.0) {
- lackQty = lackQty + issued;
- }
- }
- // 浠诲姟杩芥函
- List<WrkTraceVo> wrkTraceVos = new ArrayList<>();
- List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNoGroupByMatnrOfSum(order.getOrderNo());
- for (WrkDetl wrkDetl : wrkDetls) {
- WrkMast wrkMast = wrkMastService.getOne(new LambdaQueryWrapper<WrkMast>().eq(WrkMast::getWrkNo, wrkDetl.getWrkNo()).eq(WrkMast::getIoTime, wrkDetl.getIoTime()));
- if (wrkMast == null) {
- WrkMastLog wrkMastLog = wrkMastLogService.getOne(new LambdaQueryWrapper<WrkMastLog>().eq(WrkMastLog::getWrkNo, wrkDetl.getWrkNo()).eq(WrkMastLog::getIoTime, wrkDetl.getIoTime()));
- if (wrkMastLog != null) {
- wrkMast = new WrkMast();
- BeanUtils.copyProperties(wrkMastLog, wrkMast);
- } else {
- continue;
- }
- }
- boolean exist = false;
- for (WrkTraceVo vo : wrkTraceVos) {
- if (vo.getWrkNo().equals(wrkMast.getWrkNo()) && vo.getIoTimeStr().equals(DateUtils.convert(wrkMast.getIoTime()))) {
- vo.getWrkDetls().add(wrkDetl);
- exist = true;
- }
- }
- if (!exist) {
- WrkTraceVo vo = new WrkTraceVo(wrkMast.getWrkNo(), DateUtils.convert(wrkMast.getIoTime()), wrkMast, wrkDetl);
- wrkTraceVos.add(vo);
- }
- }
- if (!Cools.isEmpty(wrkTraceVos) && wrkTraceVos.size() > 1) {
- wrkTraceVos.sort((o1, o2) -> (int) (o2.getWrkMast().getIoTime().getTime() - o1.getWrkMast().getIoTime().getTime()));
- }
- return R.ok().add(Cools
- .add("list", wrkTraceVos)
- .add("orderNo", order.getOrderNo())
- .add("totalQty", totalQty)
- .add("wrkQty", wrkQty)
- .add("lackQty", lackQty)
- );
- }
-
- @RequestMapping(value = "/order/form/add/auth")
- @ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
- @Transactional
- public R formAdd(@RequestBody OrderDomainParam param){
- Order order = orderService.selectByNo(param.getOrderNo(), getHostId());
- if (order != null) {
- return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
- }
- // 鍒ゆ柇閲嶅璁㈠崟鍙�
- Integer orderCount = Optional.ofNullable(jdbcTemplate.queryForObject("select count(1) from man_order where order_no = '" + param.getOrderNo() + "'", Integer.class)).orElse(0);
- Integer orderLogCount = Optional.ofNullable(jdbcTemplate.queryForObject("select count(1) from man_order_log where order_no = '" + param.getOrderNo() + "'", Integer.class)).orElse(0);
- if (orderCount > 0 || orderLogCount > 0) {
- return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
- }
- Date now = new Date();
- order = new Order(
- String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
- param.getOrderNo(), // 璁㈠崟缂栧彿
- DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
- param.getDocType(), // 鍗曟嵁绫诲瀷
- null, // 椤圭洰缂栧彿
- null, //
- null, // 璋冩嫧椤圭洰缂栧彿
- null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
- null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
- null, // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
- null, // 鍚堣閲戦
- null, // 浼樻儬鐜�
- null, // 浼樻儬閲戦
- null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
- null, // 瀹炰粯閲戦
- null, // 浠樻绫诲瀷
- null, // 涓氬姟鍛�
- null, // 缁撶畻澶╂暟
- null, // 閭垂鏀粯绫诲瀷
- null, // 閭垂
- null, // 浠樻鏃堕棿
- null, // 鍙戣揣鏃堕棿
- null, // 鐗╂祦鍚嶇О
- null, // 鐗╂祦鍗曞彿
- 1L, // 璁㈠崟鐘舵��
- 1, // 鐘舵��
- getUserId(), // 娣诲姞浜哄憳
- now, // 娣诲姞鏃堕棿
- getUserId(), // 淇敼浜哄憳
- now, // 淇敼鏃堕棿
- null, // 澶囨敞
- getHostId()
- );
- if (!orderService.save(order)) {
- throw new CoolException("淇濆瓨璁㈠崟涓绘。澶辫触");
- }
- List<DetlDto> list = new ArrayList<>();
- for (OrderDetl orderDetl : param.getOrderDetlList()) {
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
- if (DetlDto.has(list, dto)) {
- OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
- item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
- if (!orderDetlService.updateById(item)) {
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
- }
- } else {
- list.add(dto);
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(getUserId());
- orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(getUserId());
- orderDetl.setUpdateTime(now);
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
- if (!orderDetlService.save(orderDetl)) {
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
- }
- }
- }
- return R.ok("璁㈠崟娣诲姞鎴愬姛");
- }
-
- @RequestMapping(value = "/order/nav/list/auth")
- @ManagerAuth
- public R navList(@RequestParam(required = false) String orderNo){
- LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Order::getHostId, getHostId());
- if (!Cools.isEmpty(orderNo)) {
- wrapper.like(Order::getOrderNo, orderNo);
- }
- wrapper.le(Order::getSettle, 2).eq(Order::getStatus, 1);
- wrapper.orderByDesc(Order::getCreateTime);
- List<Order> orders = orderService.list(wrapper);
- // 淇濈暀鍑哄簱鍗�
- if (!Cools.isEmpty(orders)) {
- Iterator<Order> iterator = orders.iterator();
- while (iterator.hasNext()) {
- Order order = iterator.next();
- if (order.getDocType() != null) {
- DocType docType = docTypeService.getById(order.getDocType());
- if (docType != null) {
- if (docType.getPakout() == 0) {
- iterator.remove();
- }
- }
- }
- }
- }
- return R.ok().add(orders);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderDetlController.java
deleted file mode 100644
index 4d3e4e0..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderDetlController.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.OrderDetl;
-import com.zy.asrs.common.wms.service.OrderDetlService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class OrderDetlController extends BaseController {
-
- @Autowired
- private OrderDetlService orderDetlService;
-
- @RequestMapping(value = "/orderDetl/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(orderDetlService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/orderDetl/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<OrderDetl> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(OrderDetl::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(OrderDetl::getId, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(OrderDetl::getCreateTime, DateUtils.convert(range[0]));
- wrapper.le(OrderDetl::getCreateTime, DateUtils.convert(range[1]));
- }
- if (!Cools.isEmpty(param.get("order_id"))) {
- wrapper.eq(OrderDetl::getOrderId, param.get("order_id"));
- }
- return R.ok(orderDetlService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/orderDetl/add/auth")
- @ManagerAuth
- public R add(OrderDetl orderDetl) {
- orderDetl.setHostId(getHostId());
- orderDetlService.save(orderDetl);
- return R.ok();
- }
-
- @RequestMapping(value = "/orderDetl/update/auth")
- @ManagerAuth
- public R update(OrderDetl orderDetl){
- if (Cools.isEmpty(orderDetl) || null==orderDetl.getId()){
- return R.error();
- }
- orderDetlService.updateById(orderDetl);
- return R.ok();
- }
-
- @RequestMapping(value = "/orderDetl/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- orderDetlService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/orderDetlQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<OrderDetl> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(OrderDetl::getId, condition);
- wrapper.eq(OrderDetl::getHostId, getHostId());
- Page<OrderDetl> page = orderDetlService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (OrderDetl orderDetl : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", orderDetl.getId());
- map.put("value", orderDetl.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/orderDetl/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<OrderDetl> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(OrderDetl::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(OrderDetl::getId, condition);
- }
- orderDetlService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
- return R.ok().add(vos);
- }
-
- @RequestMapping(value = "/orderDetl/pakout/list/auth")
- @ManagerAuth
- public R pakoutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- IPage<OrderDetl> pakoutPage = orderDetlService.getPakoutPage(curr, limit, param);
- return R.ok(pakoutPage);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderDetlLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderDetlLogController.java
deleted file mode 100644
index 07bc75c..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderDetlLogController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.OrderDetlLog;
-import com.zy.asrs.common.wms.service.OrderDetlLogService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class OrderDetlLogController extends BaseController {
-
- @Autowired
- private OrderDetlLogService orderDetlLogService;
-
- @RequestMapping(value = "/orderDetlLog/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(orderDetlLogService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/orderDetlLog/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<OrderDetlLog> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(OrderDetlLog::getId, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(OrderDetlLog::getCreateTime, DateUtils.convert(range[0]));
- wrapper.le(OrderDetlLog::getCreateTime, DateUtils.convert(range[1]));
- }
- return R.ok(orderDetlLogService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/orderDetlLog/add/auth")
- @ManagerAuth
- public R add(OrderDetlLog orderDetlLog) {
- orderDetlLogService.save(orderDetlLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/orderDetlLog/update/auth")
- @ManagerAuth
- public R update(OrderDetlLog orderDetlLog){
- if (Cools.isEmpty(orderDetlLog) || null==orderDetlLog.getId()){
- return R.error();
- }
- orderDetlLogService.updateById(orderDetlLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/orderDetlLog/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- orderDetlLogService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/orderDetlLogQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<OrderDetlLog> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(OrderDetlLog::getId, condition);
- Page<OrderDetlLog> page = orderDetlLogService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (OrderDetlLog orderDetlLog : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", orderDetlLog.getId());
- map.put("value", orderDetlLog.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/orderDetlLog/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<OrderDetlLog> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(OrderDetlLog::getId, condition);
- }
- orderDetlLogService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderLogController.java
deleted file mode 100644
index 39d2b17..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderLogController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.OrderLog;
-import com.zy.asrs.common.wms.service.OrderLogService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class OrderLogController extends BaseController {
-
- @Autowired
- private OrderLogService orderLogService;
-
- @RequestMapping(value = "/orderLog/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(orderLogService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/orderLog/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<OrderLog> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(OrderLog::getId, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(OrderLog::getCreateTime, DateUtils.convert(range[0]));
- wrapper.le(OrderLog::getCreateTime, DateUtils.convert(range[1]));
- }
- return R.ok(orderLogService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/orderLog/add/auth")
- @ManagerAuth
- public R add(OrderLog orderLog) {
- orderLogService.save(orderLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/orderLog/update/auth")
- @ManagerAuth
- public R update(OrderLog orderLog){
- if (Cools.isEmpty(orderLog) || null==orderLog.getId()){
- return R.error();
- }
- orderLogService.updateById(orderLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/orderLog/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- orderLogService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/orderLogQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<OrderLog> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(OrderLog::getId, condition);
- Page<OrderLog> page = orderLogService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (OrderLog orderLog : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", orderLog.getId());
- map.put("value", orderLog.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/orderLog/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<OrderLog> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(OrderLog::getId, condition);
- }
- orderLogService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderSettleController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderSettleController.java
deleted file mode 100644
index 03331f8..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderSettleController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.OrderSettle;
-import com.zy.asrs.common.wms.service.OrderSettleService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class OrderSettleController extends BaseController {
-
- @Autowired
- private OrderSettleService orderSettleService;
-
- @RequestMapping(value = "/orderSettle/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(orderSettleService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/orderSettle/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<OrderSettle> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(OrderSettle::getSettleName, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(OrderSettle::getCreateTime, DateUtils.convert(range[0]));
- wrapper.le(OrderSettle::getCreateTime, DateUtils.convert(range[1]));
- }
- return R.ok(orderSettleService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/orderSettle/add/auth")
- @ManagerAuth
- public R add(OrderSettle orderSettle) {
- orderSettleService.save(orderSettle);
- return R.ok();
- }
-
- @RequestMapping(value = "/orderSettle/update/auth")
- @ManagerAuth
- public R update(OrderSettle orderSettle){
- if (Cools.isEmpty(orderSettle) || null==orderSettle.getOrderSettle()){
- return R.error();
- }
- orderSettleService.updateById(orderSettle);
- return R.ok();
- }
-
- @RequestMapping(value = "/orderSettle/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- orderSettleService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/orderSettleQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<OrderSettle> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(OrderSettle::getSettleName, condition);
- Page<OrderSettle> page = orderSettleService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (OrderSettle orderSettle : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", orderSettle.getOrderSettle());
- map.put("value", orderSettle.getSettleName());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/orderSettle/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<OrderSettle> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(OrderSettle::getSettleName, condition);
- }
- orderSettleService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getSettleName()), item.getOrderSettle())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java
deleted file mode 100644
index 4acd058..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.domain.dto.LocDto;
-import com.zy.asrs.common.domain.dto.OrderDto;
-import com.zy.asrs.common.domain.dto.TaskDto;
-import com.zy.asrs.common.sys.service.StaDescService;
-import com.zy.asrs.common.web.BaseController;
-import com.zy.asrs.common.wms.entity.*;
-import com.zy.asrs.common.wms.service.*;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.BaseRes;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.*;
-
-/**
- * Created by vincent on 2022/3/26
- */
-
-@RestController
-public class OutController extends BaseController {
-
- @Autowired
- private OrderService orderService;
- @Autowired
- private OrderDetlService orderDetlService;
- @Autowired
- private StaDescService staDescService;
- @Autowired
- private LocDetlService locDetlService;
- @Autowired
- private LocMastService locMastService;
- @Autowired
- private WorkService workService;
- @Autowired
- private BasDevpService basDevpService;
-
- @PostMapping("/out/pakout/preview/auth")
- @ManagerAuth
- public R pakoutPreview(@RequestBody List<Long> ids) {
- if (Cools.isEmpty(ids)) {
- return R.parse(BaseRes.PARAM);
- }
- Long hostId = getHostId();
- List<OrderDetl> orderDetls = orderDetlService.listByIds(ids);
- List<LocDto> locDtos = new ArrayList<>();
-
- Set<String> exist = new HashSet<>();
-
- for (OrderDetl orderDetl : orderDetls) {
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
- if (issued <= 0.0D) { continue; }
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), hostId);
- for (LocDetl locDetl : locDetls) {
- if (!Cools.isEmpty(locDetl.getMemo())){
- continue;
- }
- if (issued > 0) {
- LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
- issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
- List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103, hostId);
- locDto.setStaNos(staNos);
- locDtos.add(locDto);
- exist.add(locDetl.getLocNo());
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
- } else {
- break;
- }
- }
- if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
- locDto.setLack(Boolean.TRUE);
- locDtos.add(locDto);
- }
- }
- return R.ok().add(locDtos);
- }
-
- @PostMapping("/out/pakout/auth")
- @ManagerAuth(memo = "璁㈠崟鍑哄簱")
- public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
- if (Cools.isEmpty(locDtos)) {
- return R.parse(BaseRes.PARAM);
- }
- Long hostId = getHostId();
- boolean lack = true;
- for (LocDto locDto : locDtos) {
- if (!locDto.isLack()) {
- lack = false;
- break;
- }
- }
- if (lack) {
- return R.error("搴撳瓨涓嶈冻");
- }
-
- Thread.sleep(500L);
-
- // 璁㈠崟棰勬牎楠� ===>> 1.璁㈠崟鐘舵�侊紱 2.璁㈠崟甯﹀嚭鏁伴噺
- List<OrderDto> orderDtos = new ArrayList<>();
- for (LocDto locDto : locDtos) {
- if (Cools.isEmpty(locDto.getOrderNo())) { continue; }
- OrderDto orderDto = new OrderDto(locDto.getOrderNo(), locDto.getMatnr(), locDto.getAnfme());
- if (OrderDto.has(orderDtos, orderDto)) {
- OrderDto dto = OrderDto.find(orderDtos, orderDto);
- assert dto != null;
- dto.setAnfme(dto.getAnfme() + orderDto.getAnfme());
- } else {
- orderDtos.add(orderDto);
- }
- }
- for (OrderDto orderDto : orderDtos) {
- Order order = orderService.selectByNo(orderDto.getOrderNo(), hostId);
- if (order.getSettle() > 2) {
- return R.error(orderDto.getOrderNo() + "璁㈠崟宸插け鏁堬紝璇峰強鏃跺埛鏂伴〉闈�");
- }
- OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), orderDto.getMatnr(), null);
- if (orderDetl.getAnfme() - orderDetl.getQty() < orderDto.getAnfme()) {
- return R.ok(orderDto.getOrderNo() + "璁㈠崟宸蹭綔涓氾紝璇峰強鏃跺埛鏂伴〉闈�");
- }
- }
-
- List<TaskDto> taskDtos = new ArrayList<>();
- // 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
- for (LocDto locDto : locDtos) {
- if (locDto.isLack()) { continue; }
- //2022-08-04 Add锛岄槻姝㈠墠绔〉闈㈡彁鍙栧簱浣嶄俊鎭悗锛屽湪鍏朵粬鍦版柟瀵硅搴撲綅鐢熸垚浜嗗嚭搴撲换鍔�(搴撲綅鐘舵�侀潪F鐘舵��)
- LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
- .eq(LocMast::getLocNo, locDto.getLocNo())
- .eq(LocMast::getHostId, hostId));
- if(!Cools.isEmpty(locMast) && !locMast.getLocSts().equals("F")){
- return R.error("搴撲綅鍙烽潪鍦ㄥ簱鐘舵�侊紝璇烽噸鏂伴�夋嫨鍑哄簱搴撲綅===>>" + locDto.getLocNo());
- }
-
- TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto, hostId);
- if (TaskDto.has(taskDtos, taskDto)) {
- TaskDto dto = TaskDto.find(taskDtos, taskDto);
- assert dto != null;
- dto.getLocDtos().addAll(taskDto.getLocDtos());
- } else {
- taskDtos.add(taskDto);
- }
- }
- // -----------------------------------------------------------------------------------------------
- for (TaskDto taskDto : taskDtos) {
- BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo(), false, hostId);
- workService.stockOut(staNo.getDevNo(), taskDto, getUserId(), hostId);
- }
- return R.ok();
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PriorController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PriorController.java
deleted file mode 100644
index 93bd2f2..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PriorController.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.domain.dto.SafeStoDo;
-import com.zy.asrs.common.domain.dto.SafeStoDto;
-import com.zy.asrs.common.wms.entity.Mat;
-import com.zy.asrs.common.wms.entity.Prior;
-import com.zy.asrs.common.wms.service.MatService;
-import com.zy.asrs.common.wms.service.PriorService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.*;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.common.web.BaseController;
-import com.zy.asrs.framework.exception.CoolException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class PriorController extends BaseController {
-
- @Autowired
- private PriorService priorService;
- @Autowired
- private MatService matService;
- @Autowired
- private SnowflakeIdWorker snowflakeIdWorker;
-
- @RequestMapping(value = "/prior/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(priorService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/prior/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<Prior> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(Prior::getId, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(Prior::getCreateTime, DateUtils.convert(range[0]));
- wrapper.le(Prior::getCreateTime, DateUtils.convert(range[1]));
- }
- return R.ok(priorService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/prior/add/auth")
- @ManagerAuth
- public R add(Prior prior) {
- priorService.save(prior);
- return R.ok();
- }
-
- @RequestMapping(value = "/prior/update/auth")
- @ManagerAuth
- public R update(Prior prior){
- if (Cools.isEmpty(prior) || null==prior.getId()){
- return R.error();
- }
- priorService.updateById(prior);
- return R.ok();
- }
-
- @RequestMapping(value = "/prior/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- priorService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/priorQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<Prior> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(Prior::getId, condition);
- Page<Prior> page = priorService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (Prior prior : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", prior.getId());
- map.put("value", prior.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/prior/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<Prior> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(Prior::getId, condition);
- }
- priorService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
- return R.ok().add(vos);
- }
-
- /**
- * 瀹夊叏搴撳瓨璀﹀憡鍒嗛〉
- */
- @RequestMapping(value = "/safeSto/list/auth")
- @ManagerAuth
- public R safeStoList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- Long hostId = getHostId();
- if (hostId != null) {
- param.put("host_id", hostId);
- }
- IPage<SafeStoDo> safeQtyPage = priorService.getSafeQtyPage(curr, limit, param);
- return R.ok(safeQtyPage);
- }
-
- @RequestMapping(value = "/safeSto/add/auth")
- @ManagerAuth(memo = "娣诲姞瀹夊叏搴撳瓨")
- public R del(@RequestBody SafeStoDto dto){
- if (Cools.isEmpty(dto.getMatId(), dto.getSafeQua())) {
- return R.parse(BaseRes.PARAM);
- }
- if (dto.getSafeQua() <= 0.0D) {
- return R.error("瀹夊叏搴撳瓨閲忓繀椤诲ぇ浜庨浂");
- }
- Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getId, dto.getMatId()).eq(Mat::getHostId, getHostId()));
- if (mat != null) {
- Prior prior = new Prior();
- prior.setHostId(getHostId());
- prior.setUuid("SP" + snowflakeIdWorker.nextId());
- prior.setMatId(mat.getId());
- prior.setMatnr(mat.getMatnr());
- prior.setMaktx(mat.getMaktx());
- prior.setLocNo(dto.getLocNo());
- prior.setSafeQua(dto.getSafeQua());
- prior.setCreateBy(getUserId());
- prior.setCreateTime(new Date());
- prior.setUpdateBy(getUserId());
- prior.setUpdateTime(new Date());
- prior.setStatus(1);
- prior.setMemo(dto.getMemo());
- if (!priorService.save(prior)) {
- throw new CoolException("鏁版嵁淇濆瓨澶辫触");
- }
- } else {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/safeSto/delete/auth")
- @ManagerAuth(memo = "鍒犻櫎搴撳瓨棰勮")
- @Transactional
- public R del(@RequestBody List<SafeStoDto> dtos){
- if (Cools.isEmpty(dtos)) {
- return R.parse(BaseRes.PARAM);
- }
- for (SafeStoDto dto : dtos) {
- if (!priorService.remove(new LambdaQueryWrapper<Prior>().eq(Prior::getId, dto.getId()).eq(Prior::getHostId, getHostId()))) {
- throw new CoolException("鍒犻櫎瀹夊叏搴撳瓨澶辫触锛岃閲嶆柊灏濊瘯");
- }
- }
- return R.ok();
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java
deleted file mode 100644
index 6f489a1..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.web.BaseController;
-import com.zy.asrs.common.wms.entity.ViewInOutBean;
-import com.zy.asrs.common.wms.entity.ViewStayTimeBean;
-import com.zy.asrs.common.wms.entity.ViewStockUseBean;
-import com.zy.asrs.common.wms.entity.ViewWorkInBean;
-import com.zy.asrs.common.wms.mapper.ReportQueryMapper;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-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;
-
-/**
- * 鏃ュ織缁熻鎺у埗鍣ㄥ眰
- * @author admin
- * @date 2018骞�11鏈�23鏃�
- */
-@RestController
-@RequestMapping("/report")
-public class ReportQueryController extends BaseController {
-
- @Autowired
- private ReportQueryMapper reportQueryMapper;
-
- //------------------搴撲綅浣跨敤缁熻--------------------------------------
- @RequestMapping("/viewStockUseList.action")
- public R queryViewStockUseListByPages(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- ViewStockUseBean bean = new ViewStockUseBean();
- bean.setPageSize(limit);
- bean.setPageNumber(curr);
-
- Page<ViewStockUseBean> page = new Page<>(curr, limit);
- IPage<ViewStockUseBean> list = reportQueryMapper.queryViewStockUseList(page, bean);
- return R.ok(list);
- }
-
- //------------------搴撳瓨婊炵暀缁熻--------------------------------------
- @RequestMapping("/viewStayTimeList.action")
- public Map<String,Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- ViewStayTimeBean bean = new ViewStayTimeBean();
- bean.setPageSize(limit);
- bean.setPageNumber(curr);
- String locNo = String.valueOf(param.get("loc_no"));
- if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
- bean.setLocNo(locNo);
- }
-
- Page<ViewStayTimeBean> page = new Page<>(curr, limit);
- IPage<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(page, bean);
- return R.ok(list);
- }
-
- //------------------绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻--------------------------------------
- @RequestMapping("/viewInOutList.action")
- public Map<String,Object> viewInOutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- ViewInOutBean bean = new ViewInOutBean();
- bean.setPageSize(limit);
- bean.setPageNumber(curr);
- Page<ViewInOutBean> page = new Page<>(curr, limit);
- IPage<ViewInOutBean> list = reportQueryMapper.queryViewInOutList(page, bean);
- return R.ok(list);
- }
-
- //------------------鏃ュ叆搴撴槑缁嗙粺璁�--------------------------------------
- @RequestMapping("/viewWorkInList.action")
- public Map<String,Object> viewWorkInList(ViewWorkInBean bean){
- Page<ViewWorkInBean> page = new Page<>(1, 99999);
- IPage<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(page, bean);
- return R.ok(list);
- }
-
- //------------------鏃ュ嚭搴撴槑缁嗙粺璁�--------------------------------------
- @RequestMapping("/viewWorkOutList.action")
- public R viewWorkOutList(ViewWorkInBean bean){
- Page<ViewWorkInBean> page = new Page<>(1, 99999);
- IPage<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(page, bean);
- return R.ok(list);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/RouterController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/RouterController.java
deleted file mode 100644
index 5048897..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/RouterController.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Created by vincent on 2019-07-30
- */
-@Controller
-public class RouterController {
-
- @Value("${server.servlet.context-path}")
- private String contextPath;
-
- @RequestMapping("/")
- public void index(HttpServletResponse response) {
- try{
- response.sendRedirect(contextPath+"/views/index.html");
- } catch (Exception ex){
- ex.printStackTrace();
- }
- }
-
- @RequestMapping("/login")
- public void login(HttpServletResponse response) {
- try{
- response.sendRedirect(contextPath+"/views/login.html");
- } catch (Exception ex){
- ex.printStackTrace();
- }
- }
-
- @RequestMapping("/pda")
- public void pda(HttpServletResponse response) {
- try{
- response.sendRedirect(contextPath+"/views/pda/login.html");
- } catch (Exception ex){
- ex.printStackTrace();
- }
- }
-
- @RequestMapping("/pda/ce")
- public void pdaCe(HttpServletResponse response) {
- try{
- response.sendRedirect(contextPath+"/views/pdaCe/login.html");
- } catch (Exception ex){
- ex.printStackTrace();
- }
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/RowLastnoController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/RowLastnoController.java
deleted file mode 100644
index 27d3af5..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/RowLastnoController.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.RowLastno;
-import com.zy.asrs.common.wms.service.RowLastnoService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class RowLastnoController extends BaseController {
-
- @Autowired
- private RowLastnoService rowLastnoService;
-
- @RequestMapping(value = "/rowLastno/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") Long id) {
- return R.ok(rowLastnoService.getById(id));
- }
-
- @RequestMapping(value = "/rowLastno/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<RowLastno> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(RowLastno::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(RowLastno::getWhsType, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(RowLastno::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(RowLastno::getAppeTime, DateUtils.convert(range[1]));
- }
- return R.ok(rowLastnoService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/rowLastno/add/auth")
- @ManagerAuth
- public R add(RowLastno rowLastno) {
- rowLastno.setHostId(getHostId());
- rowLastnoService.save(rowLastno);
- return R.ok();
- }
-
- @RequestMapping(value = "/rowLastno/update/auth")
- @ManagerAuth
- public R update(RowLastno rowLastno){
- if (Cools.isEmpty(rowLastno) || null==rowLastno.getWhsType()){
- return R.error();
- }
- rowLastnoService.updateById(rowLastno);
- return R.ok();
- }
-
- @RequestMapping(value = "/rowLastno/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- rowLastnoService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/rowLastnoQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<RowLastno> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(RowLastno::getHostId, getHostId());
- wrapper.like(RowLastno::getWhsType, condition);
- Page<RowLastno> page = rowLastnoService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (RowLastno rowLastno : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", rowLastno.getWhsType());
- map.put("value", rowLastno.getWhsType());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/rowLastno/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<RowLastno> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(RowLastno::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(RowLastno::getWhsType, condition);
- }
- rowLastnoService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getWhsType()), item.getWhsType().longValue())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/StaDescController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/StaDescController.java
deleted file mode 100644
index c014b42..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/StaDescController.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.domain.entity.StaDesc;
-import com.zy.asrs.common.sys.service.StaDescService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class StaDescController extends BaseController {
-
- @Autowired
- private StaDescService staDescService;
-
- @RequestMapping(value = "/staDesc/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(staDescService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/staDesc/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<StaDesc> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(StaDesc::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(StaDesc::getTypeId, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(StaDesc::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(StaDesc::getAppeTime, DateUtils.convert(range[1]));
- }
- if (!Cools.isEmpty(param.get("device_no"))) {
- wrapper.eq(StaDesc::getDeviceNo, param.get("device_no"));
- }
- if (!Cools.isEmpty(param.get("device_stn"))) {
- wrapper.eq(StaDesc::getDeviceStn, param.get("device_stn"));
- }
- return R.ok(staDescService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/staDesc/add/auth")
- @ManagerAuth
- public R add(StaDesc staDesc) {
- staDesc.setHostId(getHostId());
- staDescService.save(staDesc);
- return R.ok();
- }
-
- @RequestMapping(value = "/staDesc/update/auth")
- @ManagerAuth
- public R update(StaDesc staDesc){
- if (Cools.isEmpty(staDesc) || null==staDesc.getTypeId()){
- return R.error();
- }
- staDescService.updateById(staDesc);
- return R.ok();
- }
-
- @RequestMapping(value = "/staDesc/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- staDescService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/staDescQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<StaDesc> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(StaDesc::getHostId, getHostId());
- wrapper.like(StaDesc::getTypeId, condition);
- Page<StaDesc> page = staDescService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (StaDesc staDesc : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", staDesc.getTypeId());
- map.put("value", staDesc.getTypeId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/staDesc/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<StaDesc> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(StaDesc::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(StaDesc::getTypeId, condition);
- }
- staDescService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getTypeId()), item.getTypeId())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
deleted file mode 100644
index b9527f6..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.domain.CodeRes;
-import com.zy.asrs.common.domain.entity.MatExcel;
-import com.zy.asrs.common.domain.entity.MatPrint;
-import com.zy.asrs.common.utils.*;
-import com.zy.asrs.common.wms.entity.Mat;
-import com.zy.asrs.common.wms.entity.Tag;
-import com.zy.asrs.common.wms.service.MatService;
-import com.zy.asrs.common.wms.service.TagService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.BaseRes;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import com.zy.asrs.wms.config.AdminInterceptor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletResponse;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.*;
-
-@RestController
-public class TagController extends BaseController {
-
- @Autowired
- private TagService tagService;
- @Autowired
- private MatService matService;
- @Autowired
- private TreeUtils treeUtils;
-
- @RequestMapping(value = "/tag/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(tagService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/tag/page/auth")
- @ManagerAuth
- public R page(@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) {
- Long hostId = getHostId();
- LambdaQueryWrapper<Tag> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Tag::getHostId, hostId);
- excludeTrash(param);
- return R.parse("0-鎿嶄綔鎴愬姛").add(tagService.list(wrapper));
- }
-
-
- @RequestMapping(value = "/tag/add/auth")
- @ManagerAuth
- public R add(Tag tag) {
- tag.setHostId(getHostId());
- tag.setStatus(1);
- tagService.save(tag);
- return R.ok();
- }
-
- @RequestMapping(value = "/tag/update/auth")
- @ManagerAuth
- public R update(Tag tag){
- if (Cools.isEmpty(tag) || null== tag.getId()){
- return R.error();
- }
- tagService.updateById(tag);
- return R.ok();
- }
-
- @RequestMapping(value = "/tag/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- tagService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/tagQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<Tag> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(Tag::getId, condition);
- Page<Tag> page = tagService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (Tag tag : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", tag.getId());
- map.put("value", tag.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/tag/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<Tag> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(Tag::getId, condition);
- }
- tagService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
- return R.ok().add(vos);
- }
-
- @PostMapping(value = "/tag/tree/auth")
- @ManagerAuth
- public R tree(@RequestParam(required = false, defaultValue = "") String condition) throws IOException, ClassNotFoundException {
- ArrayList<Map> tree = treeUtils.getTree(getOriginTag().getId(), getHostId());
- // 娣辨嫹璐�
- List<Map> result = ListUtils.deepCopy(tree);
- if (!Cools.isEmpty(condition)) {
- treeUtils.remove(condition, result);
- treeUtils.remove(condition, result);
- }
- return R.ok(result);
- }
-
- /*************************************** 鎵撳嵃鐩稿叧 ***********************************************/
-
- @RequestMapping(value = "/mac/code/auth")
-// @ManagerAuth(memo = "鐗╂枡缂栫爜鏉″舰鐮佽幏鍙�(type:1(鏉″舰鐮�);2(浜岀淮鐮�)")
- public R matCodeBarcode(@RequestParam(defaultValue = "1") Integer type
- , @RequestParam String param
- , HttpServletResponse response) throws Exception {
- AdminInterceptor.cors(response);
- if (Cools.isEmpty(param)){
- return R.parse(BaseRes.EMPTY);
- }
- BufferedImage img;
- if (type == 1) {
- img = BarcodeUtils.encode(param);
- } else {
- img = QrCode.createImg(param);
- }
- if (!ImageIO.write(img, "jpg", response.getOutputStream())) {
- throw new IOException("Could not write an image of format jpg");
- }
- response.getOutputStream().flush();
- response.getOutputStream().close();
- return R.ok();
- }
-
- // 鎵撳嵃
- @RequestMapping(value = "/mat/print/auth")
- @ManagerAuth(memo = "鍟嗗搧缂栫爜鎵撳嵃")
- public R matCodePrint(@RequestParam(value = "param[]") String[] param) {
- if(Cools.isEmpty(param)) {
- return R.parse(CodeRes.EMPTY);
- }
- List<MatPrint> res = new ArrayList<>();
- for (String matnr : param){
- Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr));
- // 鎵撳嵃鏁版嵁娉ㄥ叆
- MatPrint print = new MatPrint();
- print.setMatnr(mat.getMatnr());
- print.setBarcode(mat.getBarcode());
- print.setMaktx(mat.getMaktx());
- print.setSpecs(mat.getSpecs());
- print.setUnit(mat.getUnit());
- print.setMemo(mat.getMemo());
- res.add(print);
- }
- return R.ok().add(res);
- }
-
-
- /*************************************** 鏁版嵁鐩稿叧 ***********************************************/
-
- /**
- * excel瀵煎叆妯℃澘涓嬭浇
- */
- @RequestMapping(value = "/mat/excel/import/mould")
- public void matExcelImportMould(HttpServletResponse response) throws IOException {
- List<MatExcel> excels = new ArrayList<>();
- response.setContentType("application/vnd.ms-excel");
- response.setCharacterEncoding("utf-8");
- String fileName = URLEncoder.encode("鍟嗗搧妗ｆExcel瀵煎叆妯℃澘", "UTF-8");
- response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
- EasyExcel.write(response.getOutputStream(), MatExcel.class)
- .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
- .sheet("sheet1")
- .doWrite(excels);
- }
-
- // excel瀵煎叆
- @PostMapping(value = "/mat/excel/import/auth")
- @ManagerAuth(memo = "鍟嗗搧妗ｆ鏁版嵁瀵煎叆")
- @Transactional
- public R matExcelImport(MultipartFile file) throws IOException {
- MatExcelListener listener = new MatExcelListener(getUserId(), getHostId());
- EasyExcel.read(file.getInputStream(), MatExcel.class, listener).sheet().doRead();
- return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"鏉″晢鍝佹暟鎹�");
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java
deleted file mode 100644
index 1aefb31..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.WaitPakin;
-import com.zy.asrs.common.wms.service.WaitPakinService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class WaitPakinController extends BaseController {
-
- @Autowired
- private WaitPakinService waitPakinService;
-
- @RequestMapping(value = "/waitPakin/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(waitPakinService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/waitPakin/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<WaitPakin> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WaitPakin::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WaitPakin::getId, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(WaitPakin::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(WaitPakin::getAppeTime, DateUtils.convert(range[1]));
- }
- return R.ok(waitPakinService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/waitPakin/add/auth")
- @ManagerAuth
- public R add(WaitPakin waitPakin) {
- waitPakin.setHostId(getHostId());
- waitPakinService.save(waitPakin);
- return R.ok();
- }
-
- @RequestMapping(value = "/waitPakin/update/auth")
- @ManagerAuth
- public R update(WaitPakin waitPakin){
- if (Cools.isEmpty(waitPakin) || null==waitPakin.getId()){
- return R.error();
- }
- waitPakinService.updateById(waitPakin);
- return R.ok();
- }
-
- @RequestMapping(value = "/waitPakin/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- waitPakinService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/waitPakinQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<WaitPakin> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WaitPakin::getHostId, getHostId());
- wrapper.like(WaitPakin::getId, condition);
- Page<WaitPakin> page = waitPakinService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (WaitPakin waitPakin : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", waitPakin.getId());
- map.put("value", waitPakin.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/waitPakin/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<WaitPakin> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WaitPakin::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WaitPakin::getId, condition);
- }
- waitPakinService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java
deleted file mode 100644
index d215ca4..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.WaitPakinLog;
-import com.zy.asrs.common.wms.service.WaitPakinLogService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class WaitPakinLogController extends BaseController {
-
- @Autowired
- private WaitPakinLogService waitPakinLogService;
-
- @RequestMapping(value = "/waitPakinLog/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(waitPakinLogService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/waitPakinLog/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<WaitPakinLog> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WaitPakinLog::getId, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(WaitPakinLog::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(WaitPakinLog::getAppeTime, DateUtils.convert(range[1]));
- }
- return R.ok(waitPakinLogService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/waitPakinLog/add/auth")
- @ManagerAuth
- public R add(WaitPakinLog waitPakinLog) {
- waitPakinLogService.save(waitPakinLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/waitPakinLog/update/auth")
- @ManagerAuth
- public R update(WaitPakinLog waitPakinLog){
- if (Cools.isEmpty(waitPakinLog) || null==waitPakinLog.getId()){
- return R.error();
- }
- waitPakinLogService.updateById(waitPakinLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/waitPakinLog/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- waitPakinLogService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/waitPakinLogQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<WaitPakinLog> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(WaitPakinLog::getId, condition);
- Page<WaitPakinLog> page = waitPakinLogService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (WaitPakinLog waitPakinLog : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", waitPakinLog.getId());
- map.put("value", waitPakinLog.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/waitPakinLog/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<WaitPakinLog> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WaitPakinLog::getId, condition);
- }
- waitPakinLogService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WcsController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WcsController.java
deleted file mode 100644
index c71d2e6..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WcsController.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.domain.CodeRes;
-import com.zy.asrs.common.domain.dto.LocTypeDto;
-import com.zy.asrs.common.domain.dto.StartupDto;
-import com.zy.asrs.common.domain.param.SearchLocParam;
-import com.zy.asrs.common.web.BaseController;
-import com.zy.asrs.common.wms.entity.*;
-import com.zy.asrs.common.wms.service.*;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.exception.CoolException;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Created by vincent on 2020/10/30
- */
-@Slf4j
-@RestController
-@RequestMapping("/rpc")
-public class WcsController extends BaseController {
-
- @Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private BasDevpService basDevpService;
- @Autowired
- private CommonService commonService;
- @Autowired
- private WrkDetlService wrkDetlService;
- @Autowired
- private LocMastService locMastService;
- @Autowired
- private WaitPakinService waitPakinService;
- @Autowired
- private LocDetlService locDetlService;
-
- @PostMapping("/pakin/loc/v1")
- @ResponseBody
- public synchronized R getLocNo(@RequestBody SearchLocParam param) {
- if (Cools.isEmpty(param.getIoType())) {
- return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
- }
- if (Cools.isEmpty(param.getSourceStaNo())) {
- return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
- }
- Long hostId = param.getHostId();
- List<WaitPakin> waitPakins = null;
- if (param.getIoType() == 1) {
- if (Cools.isEmpty(param.getBarcode())) {
- return R.error("鏉＄爜涓嶈兘涓虹┖");
- }
- waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getZpallet, param.getBarcode()).eq(WaitPakin::getHostId, hostId));
- if (Cools.isEmpty(waitPakins)) {
- WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode(), hostId);
- if (wrkMast != null && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 104 || wrkMast.getIoType() == 107)) {
- return R.parse(CodeRes.PICK_600);
- }
- return R.parse(CodeRes.NO_COMB_700);
- }
- int countLoc = locDetlService.count(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getZpallet, param.getBarcode()).eq(LocDetl::getHostId, hostId));
- int countWrk = wrkDetlService.count(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getZpallet, param.getBarcode()).eq(WrkDetl::getHostId, hostId));
- if (countLoc > 0 || countWrk > 0) {
- return R.error("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�");
- }
- }
- if (Cools.isEmpty(param.getLocType1())){
- return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
- }
-
- // 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true, hostId);
- sourceStaNo.setLocType1(param.getLocType1());
- LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
- locTypeDto.setLocRangeDto(param.getLocRangeDto());
-
- StartupDto dto = null;
- switch (param.getIoType()) {
- case 1://婊℃墭鐩樺叆搴�
- assert waitPakins != null;
- dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins, hostId);
- break;
- case 10://绌烘墭鐩樺叆搴�
- dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode(), hostId);
- break;
- default:
- break;
- }
- log.info("/pakin/loc/v1:"+dto + "======鎵樼洏鐮�:"+param.getBarcode());
- return R.ok().add(dto);
- }
-
-
- /**
- * 鍏ㄦ澘鍏ュ簱
- */
- @Transactional
- public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins, Long hostId) {
- // 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true, hostId);
- // 妫�绱㈠簱浣�
- List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
- String batch = waitPakins.get(0).getBatch();
- StartupDto dto = commonService.getLocNo(1, devpNo, matNos, batch, hostId, locTypeDto, 0);
- int workNo = dto.getWorkNo();
- Date now = new Date();
- // 鐢熸垚宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(new Date());
- wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細1.鐢熸垚鍏ュ簱
- wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
- wrkMast.setIoPri(13D); // 浼樺厛绾�
- wrkMast.setSourceStaNo(dto.getSourceStaNo());
- wrkMast.setStaNo(dto.getStaNo());
- wrkMast.setLocNo(dto.getLocNo());
- wrkMast.setBarcode(barcode); // 鎵樼洏鐮�
- wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("N"); // 绌烘澘
- wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
- // 鎿嶄綔浜哄憳鏁版嵁
- wrkMast.setAppeTime(now);
- wrkMast.setModiTime(now);
- wrkMast.setHostId(hostId);
- boolean res = wrkMastService.save(wrkMast);
- if (!res) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
- // 鐢熸垚宸ヤ綔妗ｆ槑缁�
- waitPakins.forEach(waitPakin -> {
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.sync(waitPakin);
- wrkDetl.setWrkNo(wrkMast.getWrkNo());
- wrkDetl.setIoTime(wrkMast.getIoTime());
- wrkDetl.setAppeTime(now);
- wrkDetl.setModiTime(now);
- wrkDetl.setHostId(hostId);
- if (!wrkDetlService.save(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
- }
- });
- // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
- LambdaQueryWrapper<WaitPakin> wrapper = new LambdaQueryWrapper<WaitPakin>()
- .eq(WaitPakin::getZpallet, barcode)
- .eq(WaitPakin::getHostId, hostId);
- WaitPakin setParam = new WaitPakin();
- setParam.setIoStatus("Y");
- setParam.setModiTime(now);
- if (!waitPakinService.update(setParam, wrapper)) {
- throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
- }
- // 鏇存柊婧愮珯鐐逛俊鎭�
- sourceStaNo.setWrkNo(workNo);
- sourceStaNo.setModiTime(now);
- if (!basDevpService.updateById(sourceStaNo)) {
- throw new CoolException("鏇存柊婧愮珯澶辫触");
- }
- // 鏇存柊鐩爣搴撲綅鐘舵��
- LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, dto.getLocNo()).eq(LocMast::getHostId, hostId));
- if (locMast.getLocSts().equals("O")) {
- locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)) {
- throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
- }
- } else {
- throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
- }
- return dto;
- }
-
- @Transactional
- public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode, Long hostId) {
- // 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true, hostId);
- // 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(10, devpNo, null, null, hostId, locTypeDto, 0);
- int workNo = dto.getWorkNo();
- // 鐢熸垚宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(new Date());
- wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細1.鐢熸垚鍏ュ簱
- wrkMast.setIoType(10); // 鍏ュ嚭搴撶姸鎬侊細10.绌烘澘鍏ュ簱
- wrkMast.setIoPri(13D); // 浼樺厛绾�
- wrkMast.setSourceStaNo(dto.getSourceStaNo());
- wrkMast.setStaNo(dto.getStaNo());
- wrkMast.setLocNo(dto.getLocNo());
- wrkMast.setFullPlt("N"); // 婊℃澘
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("Y"); // 绌烘澘
- wrkMast.setBarcode(barcode);
- wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
- // 鎿嶄綔浜哄憳鏁版嵁
- wrkMast.setAppeTime(new Date());
- wrkMast.setModiTime(new Date());
- wrkMast.setHostId(hostId);
- boolean res = wrkMastService.save(wrkMast);
- if (!res) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
- // 鏇存柊婧愮珯鐐逛俊鎭�
- sourceStaNo.setWrkNo(workNo);
- sourceStaNo.setModiTime(new Date());
- if (!basDevpService.updateById(sourceStaNo)) {
- throw new CoolException("鏇存柊婧愮珯澶辫触");
- }
- // 鏇存柊鐩爣搴撲綅鐘舵��
- LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, dto.getLocNo()).eq(LocMast::getHostId, hostId));
- if (locMast.getLocSts().equals("O")) {
- locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
- locMast.setModiTime(new Date());
- if (!locMastService.updateById(locMast)) {
- throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
- }
- } else {
- throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
- }
- return dto;
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java
deleted file mode 100644
index 1062b75..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.zy.asrs.common.domain.param.FullStoreParam;
-import com.zy.asrs.common.domain.param.LocDetlAdjustParam;
-import com.zy.asrs.common.domain.param.StockOutParam;
-import com.zy.asrs.common.web.BaseController;
-import com.zy.asrs.common.wms.service.BasDevpService;
-import com.zy.asrs.common.wms.service.WorkService;
-import com.zy.asrs.common.wms.service.WrkMastService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.R;
-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.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 宸ヤ綔娴佹帴鍙ｆ帶鍒跺櫒
- * Created by vincent on 2020/6/10
- */
-@RestController
-public class WorkController extends BaseController {
-
- @Autowired
- private WorkService workService;
- @Autowired
- private BasDevpService basDevpService;
- @Autowired
- private WrkMastService wrkMastService;
-
- @RequestMapping("/available/put/site")
- @ManagerAuth()
- public R availablePutSite(){
- return R.ok().add(basDevpService.getAvailableInSite(getHostId()));
- }
-
- @RequestMapping("/available/empty/put/site")
- @ManagerAuth()
- public R availableEmptyPutSite(){
- return R.ok().add(basDevpService.getAvailableEmptyInSite(getHostId()));
- }
-
- @RequestMapping("/available/take/site")
- @ManagerAuth()
- public R availableTakeSite(){
- Long hostId = getHostId();
- List<Map<String, Object>> result = new ArrayList<>();
- List<Integer> outSite = basDevpService.getAvailableOutSite(101, hostId);
- for (Integer siteId : outSite) {
- Map<String, Object> map = new HashMap<>();
- map.put("siteId", siteId);
- map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
- result.add(map);
- }
- List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103, hostId);
- for (Integer siteId : pickOutSite) {
- Map<String, Object> map = new HashMap<>();
- map.put("siteId", siteId);
- map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
- result.add(map);
- }
- return R.ok().add(result);
- }
-
- @RequestMapping("/available/take/check/site")
- @ManagerAuth()
- public R availableTakeCheckSite(){
- return R.ok().add(basDevpService.getAvailableOutSite(107, getHostId()));
- }
-
- @RequestMapping("/full/store/put/start")
- @ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
- public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
- return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam, getUserId(), getHostId()));
- }
-
- @RequestMapping("/plate/out/start")
- @ManagerAuth(memo = "鍑哄簱浣滀笟")
- public R fullStoreTakeStart(@RequestBody StockOutParam param) {
- workService.startupFullTakeStore(param, getUserId(), getHostId());
- return R.ok("鍑哄簱鍚姩鎴愬姛");
- }
-
- @RequestMapping("/hand/control/wrkMast")
- @ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
- public R handControlWrkMast(@RequestParam String workNo,
- @RequestParam Integer type){
- if (type == 1) {
- workService.completeWrkMast(workNo, getUserId(), getHostId());
- return R.ok("宸ヤ綔妗ｅ凡瀹屾垚");
- } else if (type == 2) {
- workService.cancelWrkMast(workNo, getUserId(), getHostId());
- return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
- } else if (type == 3) {
- workService.pickWrkMast(workNo, getUserId(), getHostId());
- return R.ok("宸ヤ綔妗ｅ凡鎷ｆ枡");
- }
- return R.ok();
- }
-
- @RequestMapping("/locDdetl/adjust/start")
- @ManagerAuth(memo = "搴撳瓨璋冩暣")
- public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
- workService.adjustLocDetl(param, getUserId(), getHostId());
- return R.ok("搴撳瓨璋冩暣鎴愬姛");
- }
-
- @RequestMapping("/loc/move/start")
- @ManagerAuth(memo = "搴撲綅绉昏浆")
- public synchronized R locMoveStart(@RequestParam String sourceLocNo,
- @RequestParam String targetLocNo) {
- workService.locMove(sourceLocNo, targetLocNo, getUserId(), getHostId());
- return R.ok("绉诲簱鍚姩鎴愬姛");
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlController.java
deleted file mode 100644
index 5147bf3..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlController.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.WrkDetl;
-import com.zy.asrs.common.wms.service.WrkDetlService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class WrkDetlController extends BaseController {
-
- @Autowired
- private WrkDetlService wrkDetlService;
-
- @RequestMapping(value = "/wrkDetl/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(wrkDetlService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/wrkDetl/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<WrkDetl> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WrkDetl::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WrkDetl::getId, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(WrkDetl::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(WrkDetl::getAppeTime, DateUtils.convert(range[1]));
- }
- if (!Cools.isEmpty(param.get("wrk_mast_id"))) {
- wrapper.eq(WrkDetl::getWrkMastId, param.get("wrk_mast_id"));
- }
- return R.ok(wrkDetlService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/wrkDetl/add/auth")
- @ManagerAuth
- public R add(WrkDetl wrkDetl) {
- wrkDetl.setHostId(getHostId());
- wrkDetlService.save(wrkDetl);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkDetl/update/auth")
- @ManagerAuth
- public R update(WrkDetl wrkDetl){
- if (Cools.isEmpty(wrkDetl) || null==wrkDetl.getId()){
- return R.error();
- }
- wrkDetlService.updateById(wrkDetl);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkDetl/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- wrkDetlService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkDetlQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<WrkDetl> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WrkDetl::getHostId, getHostId());
- wrapper.like(WrkDetl::getId, condition);
- Page<WrkDetl> page = wrkDetlService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (WrkDetl wrkDetl : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", wrkDetl.getId());
- map.put("value", wrkDetl.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/wrkDetl/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<WrkDetl> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WrkDetl::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WrkDetl::getId, condition);
- }
- wrkDetlService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java
deleted file mode 100644
index 67a1221..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.WrkDetl;
-import com.zy.asrs.common.wms.entity.WrkDetlLog;
-import com.zy.asrs.common.wms.service.WrkDetlLogService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class WrkDetlLogController extends BaseController {
-
- @Autowired
- private WrkDetlLogService wrkDetlLogService;
-
- @RequestMapping(value = "/wrkDetlLog/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(wrkDetlLogService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/wrkDetlLog/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<WrkDetlLog> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WrkDetlLog::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WrkDetlLog::getId, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(WrkDetlLog::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(WrkDetlLog::getAppeTime, DateUtils.convert(range[1]));
- }
- if (!Cools.isEmpty(param.get("wrk_mast_id"))) {
- wrapper.eq(WrkDetlLog::getWrkMastId, param.get("wrk_mast_id"));
- }
- wrapper.orderByDesc(WrkDetlLog::getId);
- return R.ok(wrkDetlLogService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/wrkDetlLog/add/auth")
- @ManagerAuth
- public R add(WrkDetlLog wrkDetlLog) {
- wrkDetlLog.setHostId(getHostId());
- wrkDetlLogService.save(wrkDetlLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkDetlLog/update/auth")
- @ManagerAuth
- public R update(WrkDetlLog wrkDetlLog){
- if (Cools.isEmpty(wrkDetlLog) || null==wrkDetlLog.getId()){
- return R.error();
- }
- wrkDetlLogService.updateById(wrkDetlLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkDetlLog/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- wrkDetlLogService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkDetlLogQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<WrkDetlLog> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WrkDetlLog::getHostId, getHostId());
- wrapper.like(WrkDetlLog::getId, condition);
- Page<WrkDetlLog> page = wrkDetlLogService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (WrkDetlLog wrkDetlLog : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", wrkDetlLog.getId());
- map.put("value", wrkDetlLog.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/wrkDetlLog/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<WrkDetlLog> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WrkDetlLog::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WrkDetlLog::getId, condition);
- }
- wrkDetlLogService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkLastnoController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkLastnoController.java
deleted file mode 100644
index 0cd4fdd..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkLastnoController.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.WrkLastno;
-import com.zy.asrs.common.wms.service.WrkLastnoService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class WrkLastnoController extends BaseController {
-
- @Autowired
- private WrkLastnoService wrkLastnoService;
-
- @RequestMapping(value = "/wrkLastno/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") Long id) {
- return R.ok(wrkLastnoService.getById(id));
- }
-
- @RequestMapping(value = "/wrkLastno/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<WrkLastno> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WrkLastno::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WrkLastno::getWrkMk, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(WrkLastno::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(WrkLastno::getAppeTime, DateUtils.convert(range[1]));
- }
- Page<WrkLastno> page = wrkLastnoService.page(new Page<>(curr, limit), wrapper);
- return R.ok(page);
- }
-
-
- @RequestMapping(value = "/wrkLastno/add/auth")
- @ManagerAuth
- public R add(WrkLastno wrkLastno) {
- wrkLastno.setHostId(getHostId());
- wrkLastnoService.save(wrkLastno);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkLastno/update/auth")
- @ManagerAuth
- public R update(WrkLastno wrkLastno){
- if (Cools.isEmpty(wrkLastno) || null==wrkLastno.getWrkMk()){
- return R.error();
- }
- wrkLastnoService.updateById(wrkLastno);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkLastno/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- wrkLastnoService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkLastnoQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<WrkLastno> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WrkLastno::getHostId, getHostId());
- wrapper.like(WrkLastno::getWrkMk, condition);
- Page<WrkLastno> page = wrkLastnoService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (WrkLastno wrkLastno : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", wrkLastno.getWrkMk());
- map.put("value", wrkLastno.getWrkMk());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/wrkLastno/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<WrkLastno> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WrkLastno::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WrkLastno::getWrkMk, condition);
- }
- wrkLastnoService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getWrkMk()), item.getWrkMk().longValue())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
deleted file mode 100644
index 04283ca..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.WrkMast;
-import com.zy.asrs.common.wms.service.WrkMastService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class WrkMastController extends BaseController {
-
- @Autowired
- private WrkMastService wrkMastService;
-
- @RequestMapping(value = "/wrkMast/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(wrkMastService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/wrkMast/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<WrkMast> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WrkMast::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WrkMast::getWrkNo, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(WrkMast::getIoTime, DateUtils.convert(range[0]));
- wrapper.le(WrkMast::getIoTime, DateUtils.convert(range[1]));
- }
- if (!Cools.isEmpty(param.get("wrk_no"))) {
- wrapper.eq(WrkMast::getWrkNo, param.get("wrk_no"));
- }
- if (!Cools.isEmpty(param.get("wrk_sts"))) {
- wrapper.eq(WrkMast::getWrkSts, param.get("wrk_sts"));
- }
- return R.ok(wrkMastService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/wrkMast/add/auth")
- @ManagerAuth
- public R add(WrkMast wrkMast) {
- wrkMast.setHostId(getHostId());
- wrkMastService.save(wrkMast);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMast/update/auth")
- @ManagerAuth
- public R update(WrkMast wrkMast){
- if (Cools.isEmpty(wrkMast) || null==wrkMast.getId()){
- return R.error();
- }
- wrkMastService.updateById(wrkMast);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMast/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- wrkMastService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<WrkMast> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WrkMast::getHostId, getHostId());
- wrapper.like(WrkMast::getWrkNo, condition);
- Page<WrkMast> page = wrkMastService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (WrkMast wrkMast : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", wrkMast.getId());
- map.put("value", wrkMast.getWrkNo());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/wrkMast/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<WrkMast> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WrkMast::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WrkMast::getWrkNo, condition);
- }
- wrkMastService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getWrkNo()), item.getId())));
- return R.ok().add(vos);
- }
-
- @RequestMapping(value = "/wrkMast/add/pri/auth")
- @ManagerAuth(memo = "宸ヤ綔妗ｅ鍔犱紭鍏堢骇")
- public R addPri(@RequestBody List<WrkMast> list) {
- if (list.isEmpty()) {
- return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
- }
- for (WrkMast entity : list){
- entity.setIoPri(entity.getIoPri() + 1);
- }
- wrkMastService.updateBatchById(list);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMast/red/pri/auth")
- @ManagerAuth(memo = "宸ヤ綔妗ｉ檷浣庝紭鍏堢骇")
- public R redPri(@RequestBody List<WrkMast> list) {
- if (list.isEmpty()) {
- return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
- }
- for (WrkMast entity : list){
- entity.setIoPri(entity.getIoPri() - 1);
- }
- wrkMastService.updateBatchById(list);
- return R.ok();
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java
deleted file mode 100644
index 962d6d6..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.zy.asrs.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.WrkMastLog;
-import com.zy.asrs.common.wms.service.WrkMastLogService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class WrkMastLogController extends BaseController {
-
- @Autowired
- private WrkMastLogService wrkMastLogService;
-
- @RequestMapping(value = "/wrkMastLog/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(wrkMastLogService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/wrkMastLog/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<WrkMastLog> wrapper = new LambdaQueryWrapper<>();
-// wrapper.eq(WrkMastLog::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WrkMastLog::getWrkNo, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(WrkMastLog::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(WrkMastLog::getAppeTime, DateUtils.convert(range[1]));
- }
- if (!Cools.isEmpty(param.get("wrkNo"))) {
- wrapper.eq(WrkMastLog::getWrkNo, param.get("wrkNo"));
- }
- if (!Cools.isEmpty(param.get("wrkSts"))) {
- wrapper.eq(WrkMastLog::getWrkSts, param.get("wrkSts"));
- }
- if (!Cools.isEmpty(param.get("ioType"))) {
- wrapper.eq(WrkMastLog::getIoType, param.get("ioType"));
- }
- if (!Cools.isEmpty(param.get("manuType"))) {
- wrapper.like(WrkMastLog::getManuType, param.get("manuType"));
- }
- wrapper.orderByDesc(WrkMastLog::getId);
- return R.ok(wrkMastLogService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/wrkMastLog/add/auth")
- @ManagerAuth
- public R add(WrkMastLog wrkMastLog) {
- wrkMastLog.setHostId(getHostId());
- wrkMastLogService.save(wrkMastLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastLog/update/auth")
- @ManagerAuth
- public R update(WrkMastLog wrkMastLog){
- if (Cools.isEmpty(wrkMastLog) || null==wrkMastLog.getId()){
- return R.error();
- }
- wrkMastLogService.updateById(wrkMastLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastLog/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- wrkMastLogService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastLogQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<WrkMastLog> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WrkMastLog::getHostId, getHostId());
- wrapper.like(WrkMastLog::getWrkNo, condition);
- Page<WrkMastLog> page = wrkMastLogService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (WrkMastLog wrkMastLog : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", wrkMastLog.getId());
- map.put("value", wrkMastLog.getWrkNo());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/wrkMastLog/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<WrkMastLog> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WrkMastLog::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WrkMastLog::getWrkNo, condition);
- }
- wrkMastLogService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getWrkNo()), item.getId())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/AbstractHandler.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/AbstractHandler.java
deleted file mode 100644
index 65bcc7e..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/AbstractHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.zy.asrs.wms.task;
-
-import com.zy.asrs.framework.exception.CoolException;
-import com.zy.asrs.wms.task.core.ReturnT;
-import lombok.extern.slf4j.Slf4j;
-
-import java.text.MessageFormat;
-
-/**
- * Created by vincent on 2020/7/4
- */
-@Slf4j
-public abstract class AbstractHandler<T> {
-
- public final ReturnT<T> SUCCESS = new ReturnT<>(200, null);
- public final ReturnT<T> FAIL = new ReturnT<>(500, null);
-
-// protected abstract ReturnT<T> start();
-
- protected void exceptionHandle(String errorMsg){
- log.error(errorMsg);
- exceptionHandle(errorMsg, (Object) null);
- }
-
- protected void exceptionHandle(String errorMsg, Object... args){
- log.error(errorMsg);
- throw new CoolException(MessageFormat.format(errorMsg, args));
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/WorkLogScheduler.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/WorkLogScheduler.java
deleted file mode 100644
index f01d7a4..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/WorkLogScheduler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.zy.asrs.wms.task;
-
-import com.zy.asrs.common.wms.entity.WrkMast;
-import com.zy.asrs.common.wms.service.WrkMastService;
-import com.zy.asrs.wms.task.core.ReturnT;
-import com.zy.asrs.wms.task.handler.WorkLogHandler;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * Created by vincent on 2020/7/7
- */
-@Slf4j
-@Component
-public class WorkLogScheduler {
-
- @Autowired
- private WorkLogHandler workLogHandler;
- @Autowired
- private WrkMastService wrkMastService;
-
- @Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){
- List<WrkMast> wrkMasts = wrkMastService.selectToBeHistoryData();
- if (wrkMasts.isEmpty()) {
- return;
- }
- for (WrkMast wrkMast : wrkMasts) {
- ReturnT<String> result = workLogHandler.start(wrkMast);
- if (!result.isSuccess()) {
- log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMast.getWrkNo());
- }
- }
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/WorkMastScheduler.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/WorkMastScheduler.java
deleted file mode 100644
index e1e691d..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/WorkMastScheduler.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.zy.asrs.wms.task;
-
-import com.zy.asrs.common.wms.entity.WrkMast;
-import com.zy.asrs.common.wms.service.WrkMastService;
-import com.zy.asrs.wms.task.core.ReturnT;
-import com.zy.asrs.wms.task.handler.WorkMastHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by vincent on 2020/7/7
- */
-@Component
-public class WorkMastScheduler {
-
- private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class);
-
- @Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private WorkMastHandler workMastHandler;
-
- @Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){
- List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
- if (wrkMasts.isEmpty()) {
- return;
- }
- for (WrkMast wrkMast : wrkMasts) {
- ReturnT<String> returnT = workMastHandler.start(wrkMast);
- if (!returnT.isSuccess()) {
-// wrkMast.setUpdMk("X");
- if (returnT.getMsg().length() > 255) {
- returnT.setMsg(returnT.getMsg().substring(0, 150));
- }
- wrkMast.setErrorMemo(returnT.getMsg());
- wrkMast.setErrorTime(new Date());
- if (!wrkMastService.updateById(wrkMast)) {
- log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo());
- }
- }
- }
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/core/ReturnT.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/core/ReturnT.java
deleted file mode 100644
index 8ab8837..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/core/ReturnT.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.zy.asrs.wms.task.core;
-
-import java.io.Serializable;
-
-/**
- * Created by vincent on 2020/7/7
- */
-public class ReturnT<T> implements Serializable {
-
- public static final long serialVersionUID = 42L;
- public static final int SUCCESS_CODE = 200;
- public static final int FAIL_CODE = 500;
- private int code;
- private String msg;
- private T content;
-
- public ReturnT() {
- }
-
- public ReturnT(int code, String msg) {
- this.code = code;
- this.msg = msg;
- }
-
- public ReturnT(T content) {
- this.code = 200;
- this.content = content;
- }
-
- public boolean isSuccess(){
- return this.code == 200;
- }
-
- public int getCode() {
- return this.code;
- }
-
- public ReturnT<T> setCode(int code) {
- this.code = code;
- return this;
- }
-
- public String getMsg() {
- return this.msg;
- }
-
- public ReturnT<T> setMsg(String msg) {
- this.msg = msg;
- return this;
- }
-
- public T getContent() {
- return this.content;
- }
-
- public ReturnT<T> setContent(T content) {
- this.content = content;
- return this;
- }
-
- public String toString() {
- return "ReturnT [code=" + this.code + ", msg=" + this.msg + ", content=" + this.content + "]";
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java
deleted file mode 100644
index 5a35d84..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.zy.asrs.wms.task.handler;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.wms.entity.WaitPakin;
-import com.zy.asrs.common.wms.entity.WrkDetl;
-import com.zy.asrs.common.wms.entity.WrkMast;
-import com.zy.asrs.common.wms.service.*;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.wms.task.AbstractHandler;
-import com.zy.asrs.wms.task.core.ReturnT;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Created by vincent on 2020/7/6
- */
-@Slf4j
-@Service
-public class WorkLogHandler extends AbstractHandler<String> {
-
- @Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private WrkMastLogService wrkMastLogService;
- @Autowired
- private WrkDetlService wrkDetlService;
- @Autowired
- private WrkDetlLogService wrkDetlLogService;
- @Autowired
- private WaitPakinService waitPakinService;
- @Autowired
- private WaitPakinLogService waitPakinLogService;
- @Autowired
- private OrderService orderService;
-
- // update asr_wrk_mast set inv_wh = 'Y', ove_mk = 'Y' where wrk_no =
- @Transactional
- public ReturnT<String> start(WrkMast wrkMast) {
- Long hostId = wrkMast.getHostId();
- try {
- List<WrkDetl> wrkDetls = wrkDetlService.list(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId));
- // 鍖哄垎璁㈠崟浠诲姟
- List<WrkDetl> wrkDetlsKeyOrder = new ArrayList<>();
- if (!Cools.isEmpty(wrkDetls)) {
- Iterator<WrkDetl> iterator = wrkDetls.iterator();
- while (iterator.hasNext()) {
- WrkDetl wrkDetl = iterator.next();
- if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
- wrkDetlsKeyOrder.add(wrkDetl);
- iterator.remove();
- }
- }
- }
-
- // 鍏ュ簱 --------------------------------------------------------------------------------
- if (wrkMast.getWrkSts() == 100) {
- // 鍏ㄦ澘鍏ュ簱
- if (wrkMast.getIoType() == 1) {
- // 鍏ュ簱閫氱煡鍗�
- if (!Cools.isEmpty(wrkMast.getBarcode())) {
- // 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
- if (!waitPakinLogService.saveToHistory(wrkMast.getBarcode(), hostId)) {
- exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- // 鍒犻櫎鍏ュ簱閫氱煡妗�
- if (!waitPakinService.remove(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getZpallet, wrkMast.getBarcode()).eq(WaitPakin::getHostId, hostId))) {
- exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- }
-// // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆�
-// if (!Cools.isEmpty(wrkDetls)) {
-// if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls, hostId)) {
-// exceptionHandle("鐢熸垚鎵嬪姩鍏ュ簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
-// }
-// }
- // 鎷ｆ枡鍐嶅叆搴�
- } else if (wrkMast.getIoType() == 53) {
- if (!Cools.isEmpty(wrkDetls)) {
- if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls, hostId)) {
- exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- }
- }
-
- // 鍑哄簱 --------------------------------------------------------------------------------
- } else if (wrkMast.getWrkSts() == 200) {
- if (!Cools.isEmpty(wrkDetls)) {
- if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls, hostId)) {
- exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- }
- }
-
- // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (!wrkMastLogService.saveToHistory(wrkMast.getId())) {
- exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- // 鍒犻櫎宸ヤ綔涓绘。
- if (!wrkMastService.removeById(wrkMast)) {
- exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
- if (!wrkDetlLogService.saveToHistory(wrkMast.getWrkNo(), hostId)) {
-// exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- // 鍒犻櫎宸ヤ綔鏄庣粏妗�
- if (!wrkDetlService.remove(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId))) {
-// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
- for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
- orderService.checkComplete(wrkDetl.getOrderNo(), hostId);
- }
- } catch (Exception e) {
- log.error("fail", e);
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- }
- return SUCCESS;
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java
deleted file mode 100644
index 5323ac3..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java
+++ /dev/null
@@ -1,342 +0,0 @@
-package com.zy.asrs.wms.task.handler;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.wms.entity.LocDetl;
-import com.zy.asrs.common.wms.entity.LocMast;
-import com.zy.asrs.common.wms.entity.WrkDetl;
-import com.zy.asrs.common.wms.entity.WrkMast;
-import com.zy.asrs.common.wms.service.*;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.wms.task.AbstractHandler;
-import com.zy.asrs.wms.task.core.ReturnT;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by vincent on 2020/7/4
- */
-@Slf4j
-@Service
-@Transactional
-public class WorkMastHandler extends AbstractHandler<String> {
-
- @Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private WrkDetlService wrkDetlService;
- @Autowired
- private LocMastService locMastService;
- @Autowired
- private LocDetlService locDetlService;
- @Autowired
- private WaitPakinService waitPakinService;
-
- public ReturnT<String> start(WrkMast wrkMast) {
- // 99.鍏ュ簱瀹屾垚
- if (wrkMast.getWrkSts() == 99) {
- return doIn(wrkMast);
- // 199.鍑哄簱瀹屾垚
- } else if (wrkMast.getWrkSts() == 199) {
- return doOut(wrkMast);
- }
- return SUCCESS;
- }
-
- private ReturnT<String> doIn(WrkMast wrkMast){
- Date now = new Date();
- Long hostId = wrkMast.getHostId();
- LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, wrkMast.getLocNo()).eq(LocMast::getHostId, hostId));
- try {
- if (null == locMast) {
- exceptionHandle("宸ヤ綔妗workNo={0}]搴撲綅鍙烽敊璇痆locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- }
- assert locMast != null;
- switch (wrkMast.getIoType()) {
- // 绌烘澘鍏ュ簱
- case 10:
- // 淇敼搴撲綅鐘舵��=D
- if (locMast.getLocSts().equals("S") || locMast.getLocSts().equals("Q")) {
- if (!Cools.isEmpty(wrkMast.getBarcode())) {
- locMast.setBarcode(wrkMast.getBarcode());
- }
- locMast.setLocSts("D");
- locMast.setIoTime(now);
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)) {
- exceptionHandle("绌烘澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�;[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- }
- }
- break;
- // 鍏ㄦ澘鍏ュ簱
- case 1:
- // 娓呴櫎鎵�灞炲簱浣嶄箣鍓嶇殑搴撳瓨鏄庣粏
- List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo, wrkMast.getLocNo()).eq(LocDetl::getHostId, hostId));
- if (!locDetls.isEmpty()) {
- locDetlService.remove(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo, wrkMast.getLocNo()).eq(LocDetl::getHostId, hostId));
- }
- // 鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗�
- List<WrkDetl> wrkDetls = wrkDetlService.list(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId));
- if (wrkDetls.isEmpty()) {
- exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ笉瀛樺湪锛沎workNo={0}]", wrkMast.getWrkNo());
- }
- // 閬嶅巻宸ヤ綔鏄庣粏锛屾洿鏂板簱瀛樻槑缁嗗拰鍏ュ簱閫氱煡妗�
- for (WrkDetl wrkDetl : wrkDetls) {
-
- LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), hostId);
- if (null != locDetl) {
- if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), hostId)) {
- exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- }
- } else {
- locDetl = new LocDetl();
- locDetl.sync(wrkDetl);
- locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
- locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
- locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
- locDetl.setModiTime(now);
- locDetl.setAppeTime(now);
- if (!locDetlService.save(locDetl)) {
- exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- }
- }
-
- // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
- try {
-// Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
-// .eq("zpallet", wrkDetl.getZpallet())
-// .eq("matnr", wrkDetl.getMatnr())
-// .eq("anfme", wrkDetl.getAnfme());
-// if (Cools.isEmpty(wrkDetl.getBatch())) {
-// wrapper.eq("batch", wrkDetl.getBatch());
-// } else {
-// wrapper.isNull("batch").or().eq("batch", "");
-// }
-// WaitPakin setParam = new WaitPakin();
-// setParam.setIoStatus("Y");
-// setParam.setModiTime(now);
-// waitPakinService.update(setParam, wrapper);
- } catch (Exception ignore){}
-
- }
- // 淇敼搴撲綅鐘舵�� S ====>> F
- if (locMast.getLocSts().equals("S")) {
- locMast.setLocSts("F");
- locMast.setBarcode(wrkMast.getBarcode());
- locMast.setIoTime(now);
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)) {
- exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- }
- }
- break;
- // 鎷ｆ枡鍏ュ簱
- case 53:
- // 鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗�
- List<WrkDetl> wrkDetls53 = wrkDetlService.list(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId));
- if (wrkDetls53.isEmpty()) {
- exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
- }
- for (WrkDetl wrkDetl : wrkDetls53) {
-
- LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), hostId);
- if (null != locDetl) {
- if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), hostId)) {
- exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- }
- }
- }
- // 淇敼搴撲綅鐘舵�� Q ====>> F
- if (locMast.getLocSts().equals("Q")) {
- locMast.setLocSts("F");
- locMast.setBarcode(wrkMast.getBarcode());
- locMast.setIoTime(now);
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)) {
- exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- }
- }
- break;
- // 骞舵澘鍏ュ簱
- case 54:
- // 鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗�
- List<WrkDetl> wrkDetls54 = wrkDetlService.list(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId));
- if (wrkDetls54.isEmpty()) {
- exceptionHandle("骞舵澘鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
- }
- // 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏃犲簱瀛橈紝鏇炬柊澧�
- for (WrkDetl wrkDetl:wrkDetls54) {
-
- LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), hostId);
- if (null != locDetl) {
- if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), hostId)) {
- exceptionHandle("骞舵澘鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
- }
- } else {
- locDetl = new LocDetl();
- locDetl.sync(wrkDetl);
- locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
- locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
- locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
- locDetl.setModiTime(now);
- locDetl.setAppeTime(now);
- if (!locDetlService.save(locDetl)) {
- exceptionHandle("骞舵澘鍏ュ簱 ===>> 鏂板搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
- }
- }
- }
- // 淇敼搴撲綅鐘舵�� Q ====>> F
- if (locMast.getLocSts().equals("Q")) {
- locMast.setLocSts("F");
- locMast.setBarcode(wrkMast.getBarcode());
- locMast.setIoTime(now);
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)) {
- exceptionHandle("骞舵澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- }
- }
- break;
- // 鐩樼偣鍏ュ簱
- case 57:
- // 鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗�
- List<WrkDetl> wrkDetls57 = wrkDetlService.list(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId));
- if (wrkDetls57.isEmpty()) {
- exceptionHandle("鐩樼偣鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
- }
- // 淇敼搴撲綅鐘舵�� Q ====>> F
- if (locMast.getLocSts().equals("Q")) {
- locMast.setLocSts(wrkMast.getFullPlt().equals("Y")?"F":"D");
- locMast.setBarcode(wrkMast.getBarcode());
- locMast.setIoTime(now);
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)) {
- exceptionHandle("鐩樼偣鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- }
- }
- break;
- // 搴撲綅绉昏浆
- case 11:
- // 榛樿鐩爣搴撲綅鏄┖鏉�
- String locSts = "D";
- // 搴撲綅绉昏浆鍒ゆ柇鏄惁涓虹┖鏉跨Щ杞�
- if (wrkMast.getEmptyMk().equals("N")) {
- locSts = "F";
- // 杞Щ搴撳瓨鏄庣粏鏁版嵁: 搴撳瓨鍙� 鐢卞伐浣滄。婧愬簱浣嶅彉涓虹洰鏍囧簱浣�
- if (!locDetlService.updateLocNo(wrkMast.getLocNo(), wrkMast.getSourceLocNo(), hostId)) {
- exceptionHandle("搴撲綅绉昏浆 ===>> 杞Щ搴撳瓨鏄庣粏鏁版嵁澶辫触锛沎婧愬簱浣�={0}],[鐩爣搴撲綅={1}]", wrkMast.getSourceLocNo(), wrkMast.getLocNo());
- }
- }
- // 淇敼婧愬簱浣嶇姸鎬� ==> O
- LocMast sourceLoc = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, wrkMast.getSourceLocNo()).eq(LocMast::getHostId, hostId));
- if (null != sourceLoc) {
- sourceLoc.setBarcode("");
- sourceLoc.setLocSts("O");
- sourceLoc.setModiTime(now);
- sourceLoc.setIoTime(now);
- if (!locMastService.updateById(sourceLoc)) {
- exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLoc={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
- }
- }
- // 淇敼鐩爣搴撲綅鐘舵�� ==> .locSts
- locMast.setLocSts(locSts);
- locMast.setBarcode(wrkMast.getBarcode());
- locMast.setIoTime(now);
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)) {
- exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- }
- break;
- default:
- break;
- }
- // 淇敼宸ヤ綔涓绘。鐘舵��
- wrkMast.setWrkSts(100L);//100.搴撳瓨鏇存柊瀹屾垚
- wrkMast.setModiTime(now);
- if (!wrkMastService.updateById(wrkMast)) {
- exceptionHandle("鏇存柊鍏ュ簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
- }
- } catch (Exception e) {
- log.error("fail", e);
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- }
- return SUCCESS;
- }
-
- private ReturnT<String> doOut(WrkMast wrkMast){
- Date now = new Date();
- Long hostId = wrkMast.getHostId();
- LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, wrkMast.getSourceLocNo()).eq(LocMast::getHostId, hostId));
- try {
- if (null == locMast) {
- exceptionHandle("宸ヤ綔妗workNo={0}]搴撲綅鍙烽敊璇痆locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- }
- assert locMast != null;
- switch (wrkMast.getIoType()) {
- // 鍏ㄦ澘鍑哄簱
- case 101:
- // 鍑哄簱纭淇″彿浣�
-// if (Cools.isEmpty(wrkMast.getInvWh()) || wrkMast.getInvWh().equals("N")) {
-// return SUCCESS;
-// }
- // 鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗�
- List<WrkDetl> wrkDetls101 = wrkDetlService.list(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId));
- if (wrkDetls101.isEmpty()) {
- exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
- }
- for (WrkDetl wrkDetl : wrkDetls101) {
- // todo:luxiaotao 3)淇敼鍑哄簱閫氱煡妗� status ==> Y
- }
- // 鍒犻櫎宸ヤ綔妗ｆ簮搴撲綅鐨勫簱瀛樻槑缁�
- if (!locDetlService.remove(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo, wrkMast.getSourceLocNo()).eq(LocDetl::getHostId, hostId))) {
- exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鍒犻櫎搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
- }
- // 淇敼婧愬簱浣嶇姸鎬� R ===>> O
- if (locMast.getLocSts().equals("R")) {
- locMast.setLocSts("O");
- locMast.setBarcode("");
- locMast.setModiTime(now);
- locMast.setIoTime(now);
- if (!locMastService.updateById(locMast)) {
- exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
- }
- }
- break;
- // 绌烘澘鍑哄簱
- case 110:
- // 淇敼搴撲綅鐘舵�� R ===>> O
- if (locMast.getLocSts().equals("R")) {
- locMast.setLocSts("O");
- locMast.setBarcode("");
- locMast.setModiTime(now);
- locMast.setIoTime(now);
- if (!locMastService.updateById(locMast)) {
- exceptionHandle("绌烘澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
- }
- }
- break;
- default:
- break;
- }
- // 淇敼宸ヤ綔涓绘。鐘舵��
- wrkMast.setWrkSts(200L);//200.搴撳瓨鏇存柊瀹屾垚
- wrkMast.setModiTime(now);
- if (!wrkMastService.updateById(wrkMast)) {
- exceptionHandle("鏇存柊鍑哄簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
- }
- } catch (Exception e) {
- log.error("fail", e);
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- }
- return SUCCESS;
- }
-
-}
--
Gitblit v1.9.1