From b9d80dfdb1cef36c9edb8bf6b2fdf9e6e1708d2b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 26 五月 2025 16:18:24 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/nc/entity/NccCgCgdhdWms.java | 50 ++
src/main/java/com/zy/asrs/entity/OrderDetlPakin.java | 6
src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java | 64 ++-
src/main/java/com/zy/asrs/entity/OrderPakout.java | 8
src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java | 6
src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java | 10
src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java | 2
src/main/java/com/zy/asrs/entity/WrkDetl.java | 6
src/main/java/com/zy/asrs/entity/param/StockOutParam.java | 6
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 22
src/main/java/com/zy/asrs/controller/MatController.java | 66 ++--
src/main/java/com/zy/asrs/entity/param/PickMatParam.java | 6
src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java | 12
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 6
src/main/java/com/zy/asrs/controller/OrderController.java | 11
src/main/java/com/zy/asrs/entity/param/FullStoreParam.java | 6
src/main/java/com/zy/asrs/entity/OrderDetlPakout.java | 6
src/main/java/com/zy/asrs/entity/OrderDetl.java | 6
src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java | 4
src/main/java/com/zy/asrs/entity/OrderPakin.java | 8
src/main/java/com/zy/asrs/controller/MobileController.java | 100 ++++--
src/main/java/com/zy/common/model/LocDto.java | 6
src/main/java/com/zy/asrs/entity/Order.java | 171 ++++++-----
src/main/java/com/zy/asrs/entity/param/MatParam.java | 196 +++++++++++++
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 6
src/main/java/com/zy/asrs/entity/WaitPakin.java | 6
src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 57 ++-
src/main/java/com/zy/asrs/entity/LocDetl.java | 6
src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java | 18 +
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 10
30 files changed, 617 insertions(+), 270 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index eb07ba8..1c6b93f 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -13,7 +13,7 @@
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatPrint;
import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.param.EmptyPlateOutParam;
+import com.zy.asrs.entity.param.MatParam;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
@@ -22,7 +22,10 @@
import com.zy.common.entity.MatExcel;
import com.zy.common.utils.BarcodeUtils;
import com.zy.common.utils.QrCode;
+import com.zy.common.utils.Synchro;
import com.zy.common.web.BaseController;
+import com.zy.nc.entity.NccJcQilibcBarcodeflowWms;
+import com.zy.nc.service.NccJcQilibcBarcodeflowWmsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -40,17 +43,19 @@
@Autowired
private MatService matService;
+
+
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@RequestMapping(value = "/mat/auto/matnr/auth")
- public R autoMatnr(){
+ public R autoMatnr() {
return R.ok().add("YJ" + DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss).substring(0, 16));
}
@RequestMapping(value = "/mat/list/pda/auth")
@ManagerAuth
- public R pdaList(@RequestParam(required = true)Long tagId){
+ public R pdaList(@RequestParam(required = true) Long tagId) {
EntityWrapper<Mat> wrapper = new EntityWrapper<>();
wrapper.eq("tag_id", tagId);
wrapper.orderBy("create_time", false);
@@ -60,7 +65,7 @@
@RequestMapping(value = "/mat/search/pda/auth")
@ManagerAuth
- public R pdaSearch(@RequestParam(required = false)String condition){
+ public R pdaSearch(@RequestParam(required = false) String condition) {
EntityWrapper<Mat> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(condition)) {
// wrapper.like("matnr", condition).or().like("maktx", condition);
@@ -70,6 +75,7 @@
List<Mat> mats = matService.selectList(wrapper);
return R.ok().add(mats);
}
+
@RequestMapping(value = "/mat/{id}/auth")
@ManagerAuth
@@ -85,11 +91,11 @@
@RequestMapping(value = "/mat/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
Object tagId = param.get("tag_id");
if (Cools.isEmpty(tagId)) {
tagId = getOriginTag().getId();
@@ -103,10 +109,10 @@
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -134,10 +140,10 @@
return R.ok();
}
- @RequestMapping(value = "/mat/update/auth")
- @ManagerAuth
- public R update(Mat mat){
- if (Cools.isEmpty(mat) || null==mat.getId()){
+ @RequestMapping(value = "/mat/update/auth")
+ @ManagerAuth
+ public R update(Mat mat) {
+ if (Cools.isEmpty(mat) || null == mat.getId()) {
return R.error();
}
mat.setUpdateBy(getUserId());
@@ -148,12 +154,12 @@
@RequestMapping(value = "/mat/delete/auth")
@ManagerAuth
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<Mat> list = JSONArray.parseArray(param, Mat.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (Mat entity : list){
+ for (Mat entity : list) {
if (!matService.delete(new EntityWrapper<>(entity))) {
throw new CoolException("鍒犻櫎澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -163,15 +169,15 @@
@RequestMapping(value = "/mat/turn/over/list/auth")
@ManagerAuth
- public R turnOverList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
+ public R turnOverList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
return R.ok(matService.getMatTurnPage(toPage(curr, limit, param, Mat.class)));
}
@RequestMapping("/mat/turn/over/take/site")
@ManagerAuth()
- public R availableTakeSite(@RequestParam(required = false) String matnr){
+ public R availableTakeSite(@RequestParam(required = false) String matnr) {
List<Map<String, Object>> result = new ArrayList<>();
List<Mat> mats = matService.selectByMatnrLink(matnr);
for (Mat mat : mats) {
@@ -185,7 +191,7 @@
@RequestMapping(value = "/mat/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<Mat> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("mat"));
@@ -201,7 +207,7 @@
wrapper.like("matnr", condition).or().like("maktx", condition);
Page<Mat> page = matService.selectPage(new Page<>(0, 10000), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Mat mat : page.getRecords()){
+ for (Mat mat : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", mat.getId());
map.put("value", mat.getMatnr() + "(" + mat.getMaktx() + ")");
@@ -214,7 +220,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<Mat> wrapper = new EntityWrapper<Mat>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != matService.selectOne(wrapper)){
+ if (null != matService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(Mat.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -241,7 +247,7 @@
, @RequestParam String param
, HttpServletResponse response) throws Exception {
AdminInterceptor.cors(response);
- if (Cools.isEmpty(param)){
+ if (Cools.isEmpty(param)) {
return R.parse(BaseRes.EMPTY);
}
BufferedImage img;
@@ -262,11 +268,11 @@
@RequestMapping(value = "/mat/print/auth")
@ManagerAuth(memo = "鍟嗗搧缂栫爜鎵撳嵃")
public R matCodePrint(@RequestParam(value = "param[]") String[] param) {
- if(Cools.isEmpty(param)) {
+ if (Cools.isEmpty(param)) {
return R.parse(CodeRes.EMPTY);
}
List<MatPrint> res = new ArrayList<>();
- for (String matnr : param){
+ for (String matnr : param) {
Mat mat = matService.selectByMatnr(matnr);
// 鎵撳嵃鏁版嵁娉ㄥ叆
MatPrint print = new MatPrint();
@@ -307,7 +313,7 @@
public R matExcelImport(MultipartFile file) throws IOException {
MatExcelListener listener = new MatExcelListener(getUserId());
EasyExcel.read(file.getInputStream(), MatExcel.class, listener).sheet().doRead();
- return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"鏉″晢鍝佹暟鎹�");
+ return R.ok("鎴愬姛鍚屾" + listener.getTotal() + "鏉″晢鍝佹暟鎹�");
}
/*************************************** xm-select ***********************************************/
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 6a9a1e9..716d347 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -15,7 +15,11 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.WrkDto;
+import com.zy.common.model.enumUtils.OrderEnumVo;
+import com.zy.common.utils.Synchro;
import com.zy.common.web.BaseController;
+import com.zy.nc.entity.NccJcQilibcBarcodeflowWms;
+import com.zy.nc.service.NccJcQilibcBarcodeflowWmsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -29,7 +33,7 @@
*/
@RestController
@RequestMapping("mobile")
-public class MobileController extends BaseController {
+public class MobileController extends BaseController {
@Autowired
private MobileService mobileService;
@@ -56,6 +60,13 @@
@Autowired
private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private NccJcQilibcBarcodeflowWmsService nccJcQilibcBarcodeflowWmsService;
+ @Autowired
+ private OrderPakinService orderPakinService;
+
@Resource
private StaDescService staDescService;
@@ -68,7 +79,7 @@
@RequestMapping("/pda/WarehouseOutPickMerge/v1")
@ManagerAuth(memo = "鎷ｆ枡閫斾腑骞舵澘")
public R WarehouseOutPickMergeV1(@RequestBody WarehouseOutPickMergeParam param) {
- if (Cools.isEmpty(param,param.getLocNo(),param.getBarcode(),param.getCombMats())) {
+ if (Cools.isEmpty(param, param.getLocNo(), param.getBarcode(), param.getCombMats())) {
return R.parse("鍙傛暟涓嶈兘涓虹┖锛�");
}
return mobileService.WarehouseOutPickMergeV1(param, getHostId(), getUserId());
@@ -78,7 +89,7 @@
@ManagerAuth(memo = "骞舵澘鍏ュ簱")
public R pickConfirm(@RequestBody PickConfirmParam param) {
- if(Cools.isEmpty(param,param.getList(),param.getLocNo(),param.getStaNo())) {
+ if (Cools.isEmpty(param, param.getList(), param.getLocNo(), param.getStaNo())) {
return R.parse("鍙傛暟涓嶅畬鏁�");
}
return mobileService.pickConfirm(param, getUserId());
@@ -125,18 +136,18 @@
// 鍟嗗搧涓婃灦
@RequestMapping("/mat/onSale/auth")
@ManagerAuth
- public R matOnSale(@RequestBody CombParam combParam){
+ public R matOnSale(@RequestBody CombParam combParam) {
mobileService.onSale(combParam);
return R.ok("涓婃灦鎴愬姛");
}
+
// 鍟嗗搧涓嬫灦
@RequestMapping("/mat/offSale/auth")
//@ManagerAuth
- public R matOffSale(@RequestBody OffSaleParam offSaleParam){
+ public R matOffSale(@RequestBody OffSaleParam offSaleParam) {
mobileService.offSale(offSaleParam);
return R.ok("涓嬫灦鎴愬姛");
}
-
// 缁勬墭 ----------------------------------------------------------------------------------------------------
@@ -167,19 +178,19 @@
// }
@RequestMapping("/order/search/orderNo/auth")
@ManagerAuth
- public R orderSearchByBarcode(@RequestParam String orderNo){
- if (Cools.isEmpty(orderNo)){
- orderNo=null;
+ public R orderSearchByBarcode(@RequestParam String orderNo) {
+ if (Cools.isEmpty(orderNo)) {
+ orderNo = null;
}
-// List<Order> orders = orderService.selectorderNoL(orderNo);
- List<Order> orders = OrderInAndOutUtil.selectOrderNoL(null, orderNo);
- if (Cools.isEmpty(orders)){
+ List<OrderPakin> orderPakins = orderPakinService.selectorderNoL(orderNo);
+ //List<Order> orders = OrderInAndOutUtil.selectOrderNoL(OrderEnumVo.PAKIN.getCode(), orderNo);
+ if (Cools.isEmpty(orderPakins)) {
return R.ok();
}
LinkedList<CombParam> combParams = new LinkedList<>();
- if (!Cools.isEmpty(orders)){
- for (Order order:orders){
- CombParam combParam=new CombParam();
+ if (!Cools.isEmpty(orderPakins)) {
+ for (OrderPakin order : orderPakins) {
+ CombParam combParam = new CombParam();
if (order == null) {
continue;
}
@@ -194,11 +205,11 @@
List<OrderDetl> orderDetls = OrderInAndOutUtil.selectWorkingDetls(order.getPakinPakoutStatus$(), order.getId());
if (!Cools.isEmpty(orderDetls)) {
LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
- for (OrderDetl orderDetl:orderDetls){
+ for (OrderDetl orderDetl : orderDetls) {
CombParam.CombMat combMat = new CombParam.CombMat();
combMat.setMatnr(orderDetl.getMatnr());
combMat.setBatch(orderDetl.getBatch());
- combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
+ combMat.setAnfme(orderDetl.getAnfme() - orderDetl.getWorkQty());
combMat.setMaktx(orderDetl.getMaktx());
combMat.setSpecs(orderDetl.getSpecs());
combMats.add(combMat);
@@ -209,19 +220,40 @@
combParams.add(combParam);
}
}
- return R.ok().add(combParams);
+ return R.ok().add(combParams.get(0));
+ }
+
+ @RequestMapping(value = "/mat/search/auth")
+ @ManagerAuth
+ public R pdaSearchV2(@RequestParam String matnr) {
+ EntityWrapper<NccJcQilibcBarcodeflowWms> wrapper = new EntityWrapper<>();
+ wrapper.eq("VBARCODE", matnr).orderBy("ts", false);
+ NccJcQilibcBarcodeflowWms nccJcQilibcBarcodeflowWms = nccJcQilibcBarcodeflowWmsService.selectOne(wrapper);
+ if (null == nccJcQilibcBarcodeflowWms) {
+ return R.error("鏈壘鍒版鏉＄爜");
+ } else {
+ if (!nccJcQilibcBarcodeflowWms.getInfla().equals("鍑哄簱")) {
+ return R.error("璇ユ潯鐮佹渶鍚庝竴娆′笉鏄嚭搴�");
+ }
+ }
+ Mat mat = matService.selectByMatnr(nccJcQilibcBarcodeflowWms.getWlbm());
+ MatParam matParam = new MatParam();
+ Synchro.Copy(mat, matParam);
+ matParam.setBatch(nccJcQilibcBarcodeflowWms.getVbatchcode());
+ matParam.setAnfme(12D);
+ return R.ok().add(matParam);
}
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
- public R comb(@RequestBody CombParam combParam){
+ public R comb(@RequestBody CombParam combParam) {
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
@RequestMapping("/pack/get/auth")
@ManagerAuth
- public R packGet(@RequestParam String barcode){
+ public R packGet(@RequestParam String barcode) {
Pack pack = packService.selectByBarcode(barcode);
if (pack == null) {
return R.ok();
@@ -234,7 +266,7 @@
@RequestMapping("/pack/comb/auth")
@ManagerAuth(memo = "涓嬬嚎缁勬墭")
- public R packComb(@RequestBody CombParam combParam){
+ public R packComb(@RequestBody CombParam combParam) {
mobileService.packComb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
@@ -247,7 +279,7 @@
@Deprecated
public R pakoutQuery(@RequestParam(required = false) String barcode,
@RequestParam(required = false) Integer staNo,
- @RequestParam(required = false) String matnr){
+ @RequestParam(required = false) String matnr) {
if (Cools.isEmpty(barcode) && Cools.isEmpty(matnr)) {
return R.ok();
}
@@ -271,7 +303,7 @@
*/
@RequestMapping("/pakout/confirm/barcode/auth")
@ManagerAuth
- public R pakoutQueryByBarcode(@RequestParam(required = false) String barcode){
+ public R pakoutQueryByBarcode(@RequestParam(required = false) String barcode) {
if (Cools.isEmpty(barcode)) {
return R.ok();
}
@@ -292,7 +324,7 @@
*/
@RequestMapping("/pakout/confirm/goods/auth") //寰呭畬鍠� 鍘熷洜锛堝鎴锋湭缁欏嚭璇︾粏淇℃伅锛�
@ManagerAuth
- public R pakoutQueryByGoods(@RequestBody GDYKConfirmGoodsParam combParam){
+ public R pakoutQueryByGoods(@RequestBody GDYKConfirmGoodsParam combParam) {
if (Cools.isEmpty(combParam)) {
return R.ok();
}
@@ -301,29 +333,29 @@
Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, combParam.getOrderNo());
List<OrderDetl> orderDetlList = OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
OrderDetl orderDetl = null;
- for (OrderDetl orderDetl1 : orderDetlList){
- if (combParam.getMatnr().equals(orderDetl1.getMatnr()) && combParam.getBatch().equals(orderDetl1.getBatch())){
+ for (OrderDetl orderDetl1 : orderDetlList) {
+ if (combParam.getMatnr().equals(orderDetl1.getMatnr()) && combParam.getBatch().equals(orderDetl1.getBatch())) {
orderDetl = orderDetl1;
break;
}
}
- if (Cools.isEmpty(orderDetl)){
+ if (Cools.isEmpty(orderDetl)) {
return R.error("鏈煡鍒版暟鎹�");
}
- if (!orderDetl.getQty$().equals("宸插畬鎴�")){
+ if (!orderDetl.getQty$().equals("宸插畬鎴�")) {
return R.error("浠诲姟鏈畬鎴�");
}
//澶嶆牳鏁�
orderDetl.setSource(1);
// orderDetlService.updateById(orderDetl);
- OrderInAndOutUtil.updateOrderDetl(Boolean.FALSE,order,orderDetl);
+ OrderInAndOutUtil.updateOrderDetl(Boolean.FALSE, order, orderDetl);
return R.ok();
}
// 鏍规嵁搴撲綅鐮佸拰鍟嗗搧鐮佹悳绱㈠晢鍝�
@RequestMapping("/mat/find/auth")
public R find(@RequestParam(required = false) String locNo
- , @RequestParam(required = false) String matnr){
+ , @RequestParam(required = false) String matnr) {
//List<ManLocDetl> manLocDetls = manLocDetlMapper.selectItem0(locNo, matnr);
ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(locNo, matnr);
return R.ok(manLocDetl);
@@ -336,7 +368,7 @@
@RequestMapping("/pakout/confirm/pick/auth")
@ManagerAuth
public R pakoutQueryByBarcode(@RequestParam(required = false) Integer wrkNo
- , @RequestParam(required = false) String matnr){
+ , @RequestParam(required = false) String matnr) {
if (Cools.isEmpty(wrkNo)) {
return R.ok();
}
@@ -471,7 +503,7 @@
@RequestMapping("/adjust/auth")
@ManagerAuth(memo = "鐩樼偣")
- public R adjust(@RequestBody MobileAdjustParam combParam){
+ public R adjust(@RequestBody MobileAdjustParam combParam) {
mobileService.adjust(combParam, getUserId());
return R.ok("鐩樼偣鎴愬姛");
}
@@ -479,10 +511,10 @@
@PostMapping("/order/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
- if(!param.containsKey("staNo") || !param.containsKey("orderNo")){
+ if (!param.containsKey("staNo") || !param.containsKey("orderNo")) {
return R.parse(BaseRes.PARAM);
}
- mobileService.pakoutByOrder(param,getUserId());
+ mobileService.pakoutByOrder(param, getUserId());
return R.ok("鍑哄簱鎴愬姛");
}
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 996dcb0..90ba253 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -125,8 +125,8 @@
param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
param.getDocType(), // 鍗曟嵁绫诲瀷
- param.getItemId(), // 椤圭洰缂栧彿
- param.getItemName(), //
+ null, // 椤圭洰缂栧彿
+ null, //
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
@@ -206,8 +206,6 @@
order.setDocType(param.getDocType());
order.setUpdateBy(userId);
order.setUpdateTime(now);
- order.setItemId(param.getItemId());
- order.setItemName(param.getItemName());
if (!orderService.updateById(order)) {
throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
}
@@ -222,11 +220,11 @@
List<DetlDto> list = new ArrayList<>();
for (OrderDetl orderDetl : param.getOrderDetlList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
- orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ param.getItemId(), orderDetl.getStandby2(), orderDetl.getStandby3(),
orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
if (DetlDto.has(list, dto)) {
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
- orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ param.getItemId(), orderDetl.getStandby2(), orderDetl.getStandby3(),
orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
@@ -242,6 +240,7 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setStandby1(param.getItemId());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java b/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java
index 21215b6..a076f12 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java
@@ -51,6 +51,24 @@
return R.ok(orderDetlPage);
}
+ @RequestMapping(value = "/orderDetl/pda/list/auth")
+ @ManagerAuth
+ public R listpda(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<OrderDetlPakin> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ wrapper.orderBy("create_time", false);
+ }
+ wrapper.eq("status", 1);
+ Page<OrderDetlPakin> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok(orderDetlPage);
+ }
+
@RequestMapping(value = "/orderDetl/pakout/list/auth")
@ManagerAuth
public R pakoutList(@RequestParam(defaultValue = "1")Integer curr,
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java
index b0e739e..54d9ef5 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java
@@ -35,15 +35,37 @@
@RequestMapping(value = "/orderDetl/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("create_time", false);
+ }
+ wrapper.eq("status", 1);
+ Page<OrderDetlPakout> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok(orderDetlPage);
+ }
+
+ @RequestMapping(value = "/orderDetl/pda/list/auth")
+ @ManagerAuth
+ public R listpda(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
+ EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("create_time", false);
}
wrapper.eq("status", 1);
@@ -53,16 +75,16 @@
@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){
+ public R pakoutList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetlPakout.class)));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -79,10 +101,10 @@
return R.ok();
}
- @RequestMapping(value = "/orderDetl/update/auth")
- @ManagerAuth
- public R update(OrderDetlPakout orderDetl){
- if (Cools.isEmpty(orderDetl) || null==orderDetl.getId()){
+ @RequestMapping(value = "/orderDetl/update/auth")
+ @ManagerAuth
+ public R update(OrderDetlPakout orderDetl) {
+ if (Cools.isEmpty(orderDetl) || null == orderDetl.getId()) {
return R.error();
}
orderDetlService.updateById(orderDetl);
@@ -91,8 +113,8 @@
@RequestMapping(value = "/orderDetl/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
orderDetlService.deleteById(id);
}
return R.ok();
@@ -100,7 +122,7 @@
@RequestMapping(value = "/orderDetl/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("orderDetl"));
@@ -116,7 +138,7 @@
wrapper.like("id", condition);
Page<OrderDetlPakout> page = orderDetlService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (OrderDetlPakout orderDetl : page.getRecords()){
+ for (OrderDetlPakout orderDetl : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", orderDetl.getId());
map.put("value", orderDetl.getId());
@@ -129,7 +151,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<OrderDetlPakout> wrapper = new EntityWrapper<OrderDetlPakout>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != orderDetlService.selectOne(wrapper)){
+ if (null != orderDetlService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(OrderDetlPakout.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 129453c..1bf9921 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -191,21 +191,21 @@
*/
@ApiModelProperty(value= "澶囩敤1")
@TableField("box_type1")
- private String boxType1 = "1";
+ private String boxType1 = "";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
@TableField("box_type2")
- private String boxType2 = "1";
+ private String boxType2 = "";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
@TableField("box_type3")
- private String boxType3 = "1";
+ private String boxType3 = "";
/**
* 鏄惁鍐荤粨
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 02db03f..a195612 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -28,263 +28,266 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
private String uuid;
/**
* 璁㈠崟缂栧彿
*/
- @ApiModelProperty(value= "璁㈠崟缂栧彿")
+ @ApiModelProperty(value = "璁㈠崟缂栧彿")
@TableField("order_no")
private String orderNo;
/**
* 鍗曟嵁鏃ユ湡
*/
- @ApiModelProperty(value= "鍗曟嵁鏃ユ湡")
+ @ApiModelProperty(value = "鍗曟嵁鏃ユ湡")
@TableField("order_time")
private String orderTime;
/**
* 鍗曟嵁绫诲瀷
*/
- @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
+ @ApiModelProperty(value = "鍗曟嵁绫诲瀷")
@TableField("doc_type")
private Long docType;
/**
- * 椤圭洰缂栧彿
+ * 鍑哄簱浠撳簱id
*/
- @ApiModelProperty(value= "椤圭洰缂栧彿")
+ @ApiModelProperty(value = "鍑哄簱浠撳簱id")
@TableField("item_id")
- private Long itemId;
+ private String itemId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "鍑哄簱浠撳簱鍚嶇О")
@TableField("item_name")
private String itemName;
/**
- * 璋冩嫧椤圭洰缂栧彿
+ *
*/
- @ApiModelProperty(value= "璋冩嫧椤圭洰缂栧彿")
+ @ApiModelProperty(value = "ru搴撲粨搴搃d")
@TableField("allot_item_id")
- private Long allotItemId;
+ private String allotItemId;
+
+
/**
- * 鍒濆绁ㄦ嵁鍙�
+ * 鍒濆绁ㄦ嵁鍙凤紝鍏ュ簱浠撳簱id
*/
- @ApiModelProperty(value= "鍒濆绁ㄦ嵁鍙�")
+ @ApiModelProperty(value = "鍒濆绁ㄦ嵁鍙�")
@TableField("def_number")
private String defNumber;
/**
* 绁ㄦ嵁鍙�
*/
- @ApiModelProperty(value= "绁ㄦ嵁鍙�")
+ @ApiModelProperty(value = "绁ㄦ嵁鍙�")
private String number;
/**
* 瀹㈡埛缂栧彿
*/
- @ApiModelProperty(value= "瀹㈡埛缂栧彿")
+ @ApiModelProperty(value = "瀹㈡埛缂栧彿")
private Long cstmr;
/**
* 瀹㈡埛
*/
- @ApiModelProperty(value= "瀹㈡埛")
+ @ApiModelProperty(value = "瀹㈡埛")
@TableField("cstmr_name")
private String cstmrName;
/**
* 鑱旂郴鏂瑰紡
*/
- @ApiModelProperty(value= "鑱旂郴鏂瑰紡")
+ @ApiModelProperty(value = "鑱旂郴鏂瑰紡")
private String tel;
/**
* 鎿嶄綔浜哄憳
*/
- @ApiModelProperty(value= "鎿嶄綔浜哄憳")
+ @ApiModelProperty(value = "鎿嶄綔浜哄憳")
@TableField("oper_memb")
private String operMemb;
/**
* 鍚堣閲戦
*/
- @ApiModelProperty(value= "鍚堣閲戦")
+ @ApiModelProperty(value = "鍚堣閲戦")
@TableField("total_fee")
private Double totalFee;
/**
* 浼樻儬鐜�
*/
- @ApiModelProperty(value= "浼樻儬鐜�")
+ @ApiModelProperty(value = "浼樻儬鐜�")
private Double discount;
/**
* 浼樻儬閲戦
*/
- @ApiModelProperty(value= "浼樻儬閲戦")
+ @ApiModelProperty(value = "浼樻儬閲戦")
@TableField("discount_fee")
private Double discountFee;
/**
* 閿�鍞垨閲囪喘璐圭敤鍚堣
*/
- @ApiModelProperty(value= "閿�鍞垨閲囪喘璐圭敤鍚堣")
+ @ApiModelProperty(value = "閿�鍞垨閲囪喘璐圭敤鍚堣")
@TableField("other_fee")
private Double otherFee;
/**
* 瀹炰粯閲戦
*/
- @ApiModelProperty(value= "瀹炰粯閲戦")
+ @ApiModelProperty(value = "瀹炰粯閲戦")
@TableField("act_fee")
private Double actFee;
/**
* 浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处
*/
- @ApiModelProperty(value= "浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处 ")
+ @ApiModelProperty(value = "浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处 ")
@TableField("pay_type")
private Integer payType;
/**
* 涓氬姟鍛�
*/
- @ApiModelProperty(value= "涓氬姟鍛�")
+ @ApiModelProperty(value = "涓氬姟鍛�")
private String salesman;
/**
* 缁撶畻澶╂暟
*/
- @ApiModelProperty(value= "缁撶畻澶╂暟")
+ @ApiModelProperty(value = "缁撶畻澶╂暟")
@TableField("account_day")
private Integer accountDay;
/**
* 閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻
*/
- @ApiModelProperty(value= "閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻 ")
+ @ApiModelProperty(value = "閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻 ")
@TableField("post_fee_type")
private Integer postFeeType;
/**
* 閭垂
*/
- @ApiModelProperty(value= "閭垂")
+ @ApiModelProperty(value = "閭垂")
@TableField("post_fee")
private Double postFee;
/**
* 浠樻鏃堕棿
*/
- @ApiModelProperty(value= "浠樻鏃堕棿")
+ @ApiModelProperty(value = "浠樻鏃堕棿")
@TableField("pay_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date payTime;
/**
* 鍙戣揣鏃堕棿
*/
- @ApiModelProperty(value= "鍙戣揣鏃堕棿")
+ @ApiModelProperty(value = "鍙戣揣鏃堕棿")
@TableField("send_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendTime;
/**
* 鐗╂祦鍚嶇О
*/
- @ApiModelProperty(value= "鐗╂祦鍚嶇О")
+ @ApiModelProperty(value = "鐗╂祦鍚嶇О")
@TableField("ship_name")
private String shipName;
/**
* 鐗╂祦鍗曞彿
*/
- @ApiModelProperty(value= "鐗╂祦鍗曞彿")
+ @ApiModelProperty(value = "鐗╂祦鍗曞彿")
@TableField("ship_code")
private String shipCode;
/**
* 璁㈠崟鐘舵��
*/
- @ApiModelProperty(value= "璁㈠崟鐘舵��")
+ @ApiModelProperty(value = "璁㈠崟鐘舵��")
private Long settle;
/**
* 姝ュ簭
*/
- @ApiModelProperty(value= "姝ュ簭")
+ @ApiModelProperty(value = "姝ュ簭")
private Integer step;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
*/
- @ApiModelProperty(value= "鐘舵�� 2:宸插畬鎴� 1: 杩涜涓� 0: 鍒濆 ")
+ @ApiModelProperty(value = "鐘舵�� 2:宸插畬鎴� 1: 杩涜涓� 0: 鍒濆 ")
@TableField("move_status")
private Integer moveStatus;
/**
* 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
@TableField("pakin_pakout_status")
private Integer pakinPakoutStatus;
- public Order() {}
+ public Order() {
+ }
- public Order(String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,String number,Long cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Order(String uuid, String orderNo, String orderTime, Long docType, String itemId, String itemName, String allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.uuid = uuid;
this.orderNo = orderNo;
this.orderTime = orderTime;
@@ -321,7 +324,7 @@
this.memo = memo;
}
- public Order(String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,String number,Long cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer pakinPakoutStatus) {
+ public Order(String uuid, String orderNo, String orderTime, Long docType, String itemId, String itemName, String allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Integer pakinPakoutStatus) {
this.uuid = uuid;
this.orderNo = orderNo;
this.orderTime = orderTime;
@@ -435,18 +438,20 @@
// null // 澶囨敞
// );
- public String getDocType$(){
+ public String getDocType$() {
DocTypeService service = SpringUtils.getBean(DocTypeService.class);
DocType docType = service.selectById(this.docType);
- if (!Cools.isEmpty(docType)){
+ if (!Cools.isEmpty(docType)) {
return String.valueOf(docType.getDocName());
}
return null;
}
- public String getPayType$(){
- if (null == this.payType){ return null; }
- switch (this.payType){
+ public String getPayType$() {
+ if (null == this.payType) {
+ return null;
+ }
+ switch (this.payType) {
case 1:
return "鐜伴噾";
case 2:
@@ -456,8 +461,8 @@
}
}
- public String getPakinPakoutStatus$(){
- switch (this.pakinPakoutStatus){
+ public String getPakinPakoutStatus$() {
+ switch (this.pakinPakoutStatus) {
case 1:
return "Y";
case 2:
@@ -467,9 +472,11 @@
}
}
- public String getPostFeeType$(){
- if (null == this.postFeeType){ return null; }
- switch (this.postFeeType){
+ public String getPostFeeType$() {
+ if (null == this.postFeeType) {
+ return null;
+ }
+ switch (this.postFeeType) {
case 1:
return "鍦ㄧ嚎鏀粯";
case 2:
@@ -479,32 +486,34 @@
}
}
- public String getPayTime$(){
- if (Cools.isEmpty(this.payTime)){
+ public String getPayTime$() {
+ if (Cools.isEmpty(this.payTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.payTime);
}
- public String getSendTime$(){
- if (Cools.isEmpty(this.sendTime)){
+ public String getSendTime$() {
+ if (Cools.isEmpty(this.sendTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
}
- public String getSettle$(){
+ public String getSettle$() {
OrderSettleService service = SpringUtils.getBean(OrderSettleService.class);
OrderSettle orderSettle = service.selectById(this.settle);
- if (!Cools.isEmpty(orderSettle)){
+ if (!Cools.isEmpty(orderSettle)) {
return String.valueOf(orderSettle.getSettleName());
}
return null;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -514,9 +523,11 @@
}
}
- public String getMoveStatus$(){
- if (null == this.moveStatus){ return null; }
- switch (this.moveStatus){
+ public String getMoveStatus$() {
+ if (null == this.moveStatus) {
+ return null;
+ }
+ switch (this.moveStatus) {
case 2:
return "宸插璐�";
case 1:
@@ -528,33 +539,33 @@
}
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index bea7bdc..336d879 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -337,21 +337,21 @@
*/
@ApiModelProperty(value= "澶囩敤1")
@TableField("box_type1")
- private String boxType1 = "1";
+ private String boxType1 = "";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
@TableField("box_type2")
- private String boxType2 = "1";
+ private String boxType2 = "";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
@TableField("box_type3")
- private String boxType3 = "1";
+ private String boxType3 = "";
@ApiModelProperty(value= "澶囨敞")
@TableField("remark")
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
index 19ed434..381ee05 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
@@ -336,21 +336,21 @@
*/
@ApiModelProperty(value= "澶囩敤1")
@TableField("box_type1")
- private String boxType1 = "1";
+ private String boxType1 = "";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
@TableField("box_type2")
- private String boxType2 = "1";
+ private String boxType2 = "";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
@TableField("box_type3")
- private String boxType3 = "1";
+ private String boxType3 = "";
public OrderDetlPakin() {}
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index 3af2a93..72b62ff 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -336,21 +336,21 @@
*/
@ApiModelProperty(value= "澶囩敤1")
@TableField("box_type1")
- private String boxType1 = "1";
+ private String boxType1 = "";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
@TableField("box_type2")
- private String boxType2 = "1";
+ private String boxType2 = "";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
@TableField("box_type3")
- private String boxType3 = "1";
+ private String boxType3 = "";
public OrderDetlPakout() {}
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakin.java b/src/main/java/com/zy/asrs/entity/OrderPakin.java
index 8d853de..f371f15 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakin.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakin.java
@@ -64,7 +64,7 @@
*/
@ApiModelProperty(value= "椤圭洰缂栧彿")
@TableField("item_id")
- private Long itemId;
+ private String itemId;
@ApiModelProperty(value= "")
@TableField("item_name")
@@ -75,7 +75,9 @@
*/
@ApiModelProperty(value= "璋冩嫧椤圭洰缂栧彿")
@TableField("allot_item_id")
- private Long allotItemId;
+ private String allotItemId;
+
+
/**
* 鍒濆绁ㄦ嵁鍙�
@@ -278,7 +280,7 @@
public OrderPakin() {}
- public OrderPakin(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ public OrderPakin(String uuid, String orderNo, String orderTime, Long docType, String itemId, String itemName, String allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.uuid = uuid;
this.orderNo = orderNo;
this.orderTime = orderTime;
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakout.java b/src/main/java/com/zy/asrs/entity/OrderPakout.java
index aaa08a9..fc74fda 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakout.java
@@ -64,7 +64,7 @@
*/
@ApiModelProperty(value= "椤圭洰缂栧彿")
@TableField("item_id")
- private Long itemId;
+ private String itemId;
@ApiModelProperty(value= "")
@TableField("item_name")
@@ -75,7 +75,9 @@
*/
@ApiModelProperty(value= "璋冩嫧椤圭洰缂栧彿")
@TableField("allot_item_id")
- private Long allotItemId;
+ private String allotItemId;
+
+
/**
* 鍒濆绁ㄦ嵁鍙�
@@ -278,7 +280,7 @@
public OrderPakout() {}
- public OrderPakout(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ public OrderPakout(String uuid, String orderNo, String orderTime, Long docType, String itemId, String itemName, String allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.uuid = uuid;
this.orderNo = orderNo;
this.orderTime = orderTime;
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index e1bfb4c..71074e0 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -179,21 +179,21 @@
*/
@ApiModelProperty(value= "澶囩敤1")
@TableField("box_type1")
- private String boxType1 = "1";
+ private String boxType1 = "";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
@TableField("box_type2")
- private String boxType2 = "1";
+ private String boxType2 = "";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
@TableField("box_type3")
- private String boxType3 = "1";
+ private String boxType3 = "";
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index d8c7306..007ba1f 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -178,21 +178,21 @@
*/
@ApiModelProperty(value= "澶囩敤1")
@TableField("box_type1")
- private String boxType1 = "1";
+ private String boxType1 = "";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
@TableField("box_type2")
- private String boxType2 = "1";
+ private String boxType2 = "";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
@TableField("box_type3")
- private String boxType3 = "1";
+ private String boxType3 = "";
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 9563fff..99dd520 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -293,21 +293,21 @@
*/
@ApiModelProperty(value= "澶囩敤1")
@TableField("box_type1")
- private String boxType1 = "1";
+ private String boxType1 = "";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
@TableField("box_type2")
- private String boxType2 = "1";
+ private String boxType2 = "";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
@TableField("box_type3")
- private String boxType3 = "1";
+ private String boxType3 = "";
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 6fa1590..923d648 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -293,21 +293,21 @@
*/
@ApiModelProperty(value= "澶囩敤1")
@TableField("box_type1")
- private String boxType1 = "1";
+ private String boxType1 = "";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
@TableField("box_type2")
- private String boxType2 = "1";
+ private String boxType2 = "";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
@TableField("box_type3")
- private String boxType3 = "1";
+ private String boxType3 = "";
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
diff --git a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
index 673903f..0cc4c27 100644
--- a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
@@ -32,9 +32,9 @@
private String standby1 = "";
private String standby2 = "";
private String standby3 = "";
- private String boxType1 = "1";
- private String boxType2 = "1";
- private String boxType3 = "1";
+ private String boxType1 = "";
+ private String boxType2 = "";
+ private String boxType3 = "";
// 鐗╂枡鏁伴噺
private Double anfme;
diff --git a/src/main/java/com/zy/asrs/entity/param/MatParam.java b/src/main/java/com/zy/asrs/entity/param/MatParam.java
new file mode 100644
index 0000000..9844976
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/MatParam.java
@@ -0,0 +1,196 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 鍟嗗搧鍚屾鎺ュ彛锛屽弬鏁�
+ * Created on 2022/6/22
+ */
+@Data
+public class MatParam implements Serializable {
+ /**
+ * 鍟嗗搧缂栧彿
+ */
+ private double anfme;
+ /**
+ * 鍟嗗搧缂栧彿
+ */
+ private String batch;
+ /**
+ * 鍟嗗搧缂栧彿
+ */
+ private String matnr;
+
+ /**
+ * 鍟嗗搧鍚嶇О
+ */
+ private String maktx;
+
+ /**
+ * 鍟嗗搧鍒嗙被
+ */
+ private String groupCode;
+
+ /**
+ * 鍒嗙被鍚嶇О
+ */
+ private String groupName;
+
+ /**
+ * 鍒悕
+ */
+ private String name;
+
+ /**
+ * 瑙勬牸
+ */
+ private String specs;
+
+ /**
+ * 鍨嬪彿
+ */
+ private String model;
+
+ /**
+ * 棰滆壊
+ */
+ private String color;
+
+ /**
+ * 鍝佺墝
+ */
+ private String brand;
+
+ /**
+ * 鍗曚綅
+ */
+ private String unit;
+
+ /**
+ * 鍗曚环
+ */
+ private Double price;
+
+ /**
+ * sku
+ */
+ private String sku;
+
+ /**
+ * 鍗曚綅閲�
+ */
+ private Double units;
+
+ /**
+ * 鏉＄爜
+ */
+ private String barcode;
+
+ /**
+ * 浜у湴
+ */
+ private String origin;
+
+ /**
+ * 鍘傚
+ */
+ private String manu;
+
+ /**
+ * 鐢熶骇鏃ユ湡
+ */
+ private String manuDate;
+
+ /**
+ * 鍝侀」鏁�
+ */
+ private String itemNum;
+
+ /**
+ * 瀹夊叏搴撳瓨閲�
+ */
+ private Double safeQty;
+
+ /**
+ * 閲嶉噺
+ */
+ private Double weight;
+
+ /**
+ * 闀垮害
+ */
+ private Double length;
+
+ /**
+ * 浣撶Н
+ */
+ private Double volume;
+
+ /**
+ * 涓夋柟缂栫爜
+ */
+ private String threeCode;
+
+ /**
+ * 渚涘簲鍟�
+ */
+ private String supp;
+
+ /**
+ * 渚涘簲鍟嗙紪鐮�
+ */
+ private String suppCode;
+
+ /**
+ * 鏄惁鎵规 1: 鏄� 0: 鍚�
+ */
+ private Integer beBatch;
+
+ /**
+ * 淇濊川鏈�
+ */
+ private String deadTime;
+
+ /**
+ * 棰勮澶╂暟
+ */
+ private Integer deadWarn;
+
+ /**
+ * 鏉ユ簮 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ */
+ private Integer source;
+
+ /**
+ * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
+ */
+ private Integer inspect;
+
+ /**
+ * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
+ */
+ private Integer danger;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ private Integer status;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ private String createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ private String createTime;
+
+ /**
+ * 澶囨敞
+ */
+ private String memo;
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
index 96257ee..c7edc7c 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
@@ -1,6 +1,8 @@
package com.zy.asrs.entity.param;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.zy.common.model.DetlDto;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -17,9 +19,13 @@
private String orderTime;
- private Long itemId;
-
- private String itemName;
+// private String itemId;
+//
+// private String itemName;
+//
+// private String allotItemId;
+//
+// private String allotItemName;
private List<DetlDto> orderDetails;
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
index 8630ccd..f12ed03 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
@@ -21,9 +21,13 @@
private String orderTime;
- private Long itemId;
-
- private String itemName;
+// private String itemId;
+//
+// private String itemName;
+//
+// private String allotItemId;
+//
+// private String allotItemName;
private List<DetlDto> orderDetails;
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java b/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
index 1458f63..49aebbc 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
@@ -19,7 +19,7 @@
private String orderNo;
- private Long itemId;
+ private String itemId;
private String itemName;
diff --git a/src/main/java/com/zy/asrs/entity/param/PickMatParam.java b/src/main/java/com/zy/asrs/entity/param/PickMatParam.java
index 93f362c..06b65d8 100644
--- a/src/main/java/com/zy/asrs/entity/param/PickMatParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/PickMatParam.java
@@ -44,20 +44,20 @@
*/
@ApiModelProperty(value= "澶囩敤1")
@TableField("box_type1")
- private String boxType1 = "1";
+ private String boxType1 = "";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
@TableField("box_type2")
- private String boxType2 = "1";
+ private String boxType2 = "";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
@TableField("box_type3")
- private String boxType3 = "1";
+ private String boxType3 = "";
}
diff --git a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
index aa3524e..9e2dfdf 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -58,21 +58,21 @@
*/
@ApiModelProperty(value= "澶囩敤1")
@TableField("box_type1")
- private String boxType1 = "1";
+ private String boxType1 = "";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
@TableField("box_type2")
- private String boxType2 = "1";
+ private String boxType2 = "";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
@TableField("box_type3")
- private String boxType3 = "1";
+ private String boxType3 = "";
}
diff --git a/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java b/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java
index a0b3a9e..5e67d36 100644
--- a/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java
+++ b/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java
@@ -14,9 +14,9 @@
private String standby1 = "";
private String standby2 = "";
private String standby3 = "";
- private String boxType1 = "1";
- private String boxType2 = "1";
- private String boxType3 = "1";
+ private String boxType1 = "";
+ private String boxType2 = "";
+ private String boxType3 = "";
public FindLocNoAttributeVo() {
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 1e5f49d..2238830 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -546,9 +546,9 @@
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
- if (param.getCombMats().size() > 1) {
- throw new CoolException("璇锋彁鍙栦竴涓晢鍝侊紝鎴栬�呭埛鏂伴噸鏂扮粍鎵橈紒");
- }
+// if (param.getCombMats().size() > 1) {
+// throw new CoolException("璇锋彁鍙栦竴涓晢鍝侊紝鎴栬�呭埛鏂伴噸鏂扮粍鎵橈紒");
+// }
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
@@ -558,9 +558,9 @@
if (param.getBarcode().length() != 8) {
throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + param.getBarcode());
}
- if (param.getCombMats().size() > 1) {
- throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
- }
+// if (param.getCombMats().size() > 1) {
+// throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
+// }
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
@@ -620,20 +620,14 @@
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
- // TODO 涓嶈�冭檻浠ｇ爜鏁堢巼锛屽洜涓烘棫浠ｇ爜bug灏�
- if (!Cools.isEmpty(elem.getVbarcode())) {
- NccJcQilibcBarcodeflowWms vbarcode1 = barcodeflowWmsService.selectOne(new EntityWrapper<NccJcQilibcBarcodeflowWms>().eq("vbarcode", elem.getVbarcode()));
- elem.setBatch(vbarcode1.getVbatchcode());
- elem.setMatnr(vbarcode1.getWlbm());
- elem.setAnfme(vbarcode1.getNastnum().doubleValue());
- }
+
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
// OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3());
if (elem.getAnfme() > orderDetl.getEnableQty()) {
- throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
+ throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�,宸茬粡瓒呰繃鍗曟嵁鍏ュ簱鏁伴噺");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
// if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index c02a411..77062bf 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -97,6 +97,7 @@
null, // 澶囨敞
1
);
+
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -128,6 +129,9 @@
orderDetl.setStandby1(detlDto.getStandby1());
orderDetl.setStandby2(detlDto.getStandby2());
orderDetl.setStandby3(detlDto.getStandby3());
+ orderDetl.setBoxType1(detlDto.getBoxType1());
+ orderDetl.setBoxType2(detlDto.getBoxType2());
+ orderDetl.setBoxType3(detlDto.getBoxType3());
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setCreateBy(9527L);
@@ -215,7 +219,8 @@
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
if (!Cools.isEmpty(order)) {
if (order.getSettle() > 1L) {
- throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
+ //TODO
+ //throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
}
orderService.remove(order.getId());
}
@@ -292,6 +297,9 @@
orderDetl.setStandby1(detlDto.getStandby1());
orderDetl.setStandby2(detlDto.getStandby2());
orderDetl.setStandby3(detlDto.getStandby3());
+ orderDetl.setBoxType1(detlDto.getBoxType1());
+ orderDetl.setBoxType2(detlDto.getBoxType2());
+ orderDetl.setBoxType3(detlDto.getBoxType3());
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setCreateBy(9527L);
diff --git a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
index 72b5c6d..e668565 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -100,24 +100,37 @@
}
break;
case "杞簱-鍑哄簱":
- process1 = processZKCK(order, orderDetls);
- List<Object> zkck1 = new ArrayList<>();
- zkck1.add(process1);
- //鍙戦�佽姹�
- response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, whstrans, JSONObject.toJSONString(zkck1));
- if (!Cools.isEmpty(response) && response.isSuccess()) {
- log.info("杞簱-鍑哄簱1response:{}", response);
- step = 1;
- }
+ if (step == 1) {
+ process2 = processGENERALOUT2(orderDetls);
+ List<Object> zkck2 = new ArrayList<>();
+ zkck2.add(process2);
+ //鍙戦�佽姹�
+ response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, generalout, JSONObject.toJSONString(zkck2));
+ if (!Cools.isEmpty(response) && response.isSuccess()) {
+ log.info("杞簱-鍑哄簱2response:{}", response);
+ step = 10;
+ }
+ } else {
+ process1 = processZKCK(order, orderDetls);
+ List<Object> zkck1 = new ArrayList<>();
+ zkck1.add(process1);
+ //鍙戦�佽姹�
+ response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, whstrans, JSONObject.toJSONString(zkck1));
+ if (!Cools.isEmpty(response) && response.isSuccess()) {
+ log.info("杞簱-鍑哄簱1response:{}", response);
- process2 = processGENERALOUT2(orderDetls);
- List<Object> zkck2 = new ArrayList<>();
- zkck2.add(process2);
- //鍙戦�佽姹�
- response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, generalout, JSONObject.toJSONString(zkck2));
- if (!Cools.isEmpty(response) && response.isSuccess()) {
- log.info("杞簱-鍑哄簱2response:{}", response);
- step = 10;
+ process2 = processGENERALOUT2(orderDetls);
+ List<Object> zkck2 = new ArrayList<>();
+ zkck2.add(process2);
+ //鍙戦�佽姹�
+ response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, generalout, JSONObject.toJSONString(zkck2));
+ if (!Cools.isEmpty(response) && response.isSuccess()) {
+ log.info("杞簱-鍑哄簱2response:{}", response);
+ step = 10;
+ }
+ } else {
+ step = 1;
+ }
}
break;
case "闆嗗洟鍐呴儴璋冩嫧":
@@ -139,7 +152,7 @@
}
} else if (step != 0) {
// 淇敼璁㈠崟鐘舵�� 鍋氭爣璁�
- if (!orderService.updateSettleStep(order.getId(), 6L, null, step)) {
+ if (!orderService.updateSettleStep(order.getId(), 4L, null, step)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
}
@@ -247,9 +260,8 @@
Map<String, Object> data = new HashMap<String, Object>();
WhsTransBillHeaderVO whsTransBillHeaderVO = new WhsTransBillHeaderVO();
whsTransBillHeaderVO.setPk_org("FYT");
- whsTransBillHeaderVO.setCwarehouseid(order.getItemId() + "");
- whsTransBillHeaderVO.setCotherbizid(order.getAllotItemId() + "");
- whsTransBillHeaderVO.setCtrantypeid("4K-Cxx-01");
+ whsTransBillHeaderVO.setCwarehouseid(order.getItemId());
+ whsTransBillHeaderVO.setCtrantypeid("4K-01");
WhsTransBillBodyVO whsTransBillBodyVO = null;
List<WhsTransBillBodyVO> whsTransBillBodyVOS = new ArrayList<>();
for (OrderDetl orderDetl : orderDetls) {
@@ -258,9 +270,10 @@
//if (!Cools.isEmpty(remark)) {
//NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class);
whsTransBillBodyVO.setNnum(orderDetl.getQty());
- whsTransBillBodyVO.setVfree10(orderDetl.getBatch());
whsTransBillBodyVO.setCmaterialoid(orderDetl.getMatnr());
+ whsTransBillBodyVO.setVbatchcode(orderDetl.getBatch());
//}
+ whsTransBillHeaderVO.setCotherbizid(orderDetl.getStandby1());
whsTransBillBodyVOS.add(whsTransBillBodyVO);
}
data.put("WhsTransBillHeaderVO", whsTransBillHeaderVO);
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index eaaffee..793701c 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -24,9 +24,9 @@
private String standby2 = "";
private String standby3 = "";
- private String boxType1 = "1";
- private String boxType2 = "1";
- private String boxType3 = "1";
+ private String boxType1 = "";
+ private String boxType2 = "";
+ private String boxType3 = "";
private String orderNo;
diff --git a/src/main/java/com/zy/nc/entity/NccCgCgdhdWms.java b/src/main/java/com/zy/nc/entity/NccCgCgdhdWms.java
index e2f2c61..e568c83 100644
--- a/src/main/java/com/zy/nc/entity/NccCgCgdhdWms.java
+++ b/src/main/java/com/zy/nc/entity/NccCgCgdhdWms.java
@@ -1,9 +1,9 @@
package com.zy.nc.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
+import java.math.BigDecimal;
+
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
-import java.math.BigDecimal;
import lombok.Data;
/**
@@ -150,11 +150,6 @@
private BigDecimal ydzsl;
/**
- *
- */
- private String vbatchcode;
-
- /**
*
*/
private BigDecimal ydsl;
@@ -183,10 +178,32 @@
*
*/
private Integer bdr;
+
/**
- *
+ *
*/
private String wmsMemo;
+
+ /**
+ *
+ */
+ private String vbatchcode;
+
+ /**
+ *
+ */
+ private String ckbm;
+
+ /**
+ *
+ */
+ private String ckmc;
+
+ /**
+ *
+ */
+ private BigDecimal ntaxmny;
+
@Override
public boolean equals(Object that) {
if (this == that) {
@@ -231,7 +248,12 @@
&& (this.getBts() == null ? other.getBts() == null : this.getBts().equals(other.getBts()))
&& (this.getWmsFlag() == null ? other.getWmsFlag() == null : this.getWmsFlag().equals(other.getWmsFlag()))
&& (this.getHdr() == null ? other.getHdr() == null : this.getHdr().equals(other.getHdr()))
- && (this.getBdr() == null ? other.getBdr() == null : this.getBdr().equals(other.getBdr()));
+ && (this.getBdr() == null ? other.getBdr() == null : this.getBdr().equals(other.getBdr()))
+ && (this.getWmsMemo() == null ? other.getWmsMemo() == null : this.getWmsMemo().equals(other.getWmsMemo()))
+ && (this.getVbatchcode() == null ? other.getVbatchcode() == null : this.getVbatchcode().equals(other.getVbatchcode()))
+ && (this.getCkbm() == null ? other.getCkbm() == null : this.getCkbm().equals(other.getCkbm()))
+ && (this.getCkmc() == null ? other.getCkmc() == null : this.getCkmc().equals(other.getCkmc()))
+ && (this.getNtaxmny() == null ? other.getNtaxmny() == null : this.getNtaxmny().equals(other.getNtaxmny()));
}
@Override
@@ -271,6 +293,11 @@
result = prime * result + ((getWmsFlag() == null) ? 0 : getWmsFlag().hashCode());
result = prime * result + ((getHdr() == null) ? 0 : getHdr().hashCode());
result = prime * result + ((getBdr() == null) ? 0 : getBdr().hashCode());
+ result = prime * result + ((getWmsMemo() == null) ? 0 : getWmsMemo().hashCode());
+ result = prime * result + ((getVbatchcode() == null) ? 0 : getVbatchcode().hashCode());
+ result = prime * result + ((getCkbm() == null) ? 0 : getCkbm().hashCode());
+ result = prime * result + ((getCkmc() == null) ? 0 : getCkmc().hashCode());
+ result = prime * result + ((getNtaxmny() == null) ? 0 : getNtaxmny().hashCode());
return result;
}
@@ -313,6 +340,11 @@
sb.append(", wmsFlag=").append(wmsFlag);
sb.append(", hdr=").append(hdr);
sb.append(", bdr=").append(bdr);
+ sb.append(", wmsMemo=").append(wmsMemo);
+ sb.append(", vbatchcode=").append(vbatchcode);
+ sb.append(", ckbm=").append(ckbm);
+ sb.append(", ckmc=").append(ckmc);
+ sb.append(", ntaxmny=").append(ntaxmny);
sb.append("]");
return sb.toString();
}
diff --git a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
index 200498f..fa91563 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -87,7 +87,7 @@
nccSaleXsfhmxWmsService.updateBatchById(wmsFlag);
} catch (Exception e) {
e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ TransactionAspectSupport. currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
}
return SUCCESS;
@@ -113,6 +113,7 @@
detlDto.setBatch(nccScZkmxbWms.getVbatchcode());
detlDto.setLineNumber(i);
detlDto.setRemark(JSONObject.toJSONString(nccScZkmxbWms));
+ detlDto.setStandby1(nccScZkmxbWms.getRkckbm());
orderDetails.add(detlDto);
i++;
nccScZkmxbWms.setWmsFlag(1);
@@ -185,6 +186,7 @@
detlDto.setBatch(nccCgCgdhdWms.getVbatchcode());
detlDto.setLineNumber(i);
detlDto.setRemark(JSONObject.toJSONString(nccCgCgdhdWms));
+ detlDto.setStandby1(nccCgCgdhdWms.getCkbm());
orderDetails.add(detlDto);
i++;
nccCgCgdhdWms.setWmsFlag(1);
--
Gitblit v1.9.1