From 26c094751ca84d2e54bf611b05111a44b406c115 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期三, 15 十二月 2021 15:32:47 +0800
Subject: [PATCH] 增加log.info
---
src/main/java/com/zy/common/entity/InterData.java | 32 ++++++++
src/main/java/com/zy/common/web/WcsController.java | 195 ++++++++++++++++++++++++++++++++++++++++++++++++
src/main/resources/application.yml | 12 +-
3 files changed, 233 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/entity/InterData.java b/src/main/java/com/zy/common/entity/InterData.java
new file mode 100644
index 0000000..656460f
--- /dev/null
+++ b/src/main/java/com/zy/common/entity/InterData.java
@@ -0,0 +1,32 @@
+package com.zy.common.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class InterData {
+
+ //1鈥斿師鏂欙紝2鈥旀垚鍝�
+ @ApiModelProperty(value= "鏉愭枡绫诲瀷")
+ private Integer matType;
+
+ //1鈥斿師鏂欏叆搴擄紝2鈥旀垚鍝佸叆搴擄紝
+ //3鈥旀垚鍝佸嚭搴�
+ @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
+ private Integer ioType;
+
+ @ApiModelProperty(value= "鍗曟嵁ID")
+ private Integer FInterID;
+
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ private String FBillNo;
+
+ @ApiModelProperty(value= "鐗╂枡缂栫爜")
+ private String Fnumber;
+
+ //浠诲姟淇敼鍚庣殑鏁伴噺锛屽鏋滀负0琛ㄧず鍙栨秷
+ @ApiModelProperty(value= "淇敼鏁伴噺")
+ private BigDecimal FQty;
+}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
new file mode 100644
index 0000000..dd60ed2
--- /dev/null
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -0,0 +1,195 @@
+package com.zy.common.web;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.service.OutStockService;
+import com.zy.asrs.service.WaitPakinService;
+import com.zy.common.entity.InterData;
+import com.zy.common.service.erp.entity.OutStockBillEntry;
+import lombok.extern.slf4j.Slf4j;
+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.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * Created by vincent on 2020/10/30
+ */
+@Slf4j
+@RestController
+
+public class WcsController {
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private OutStockService outStockService;
+
+ @PostMapping("/inout/cancel/auth/v1")
+ @ResponseBody
+ public JSON getLocNo(@RequestBody String param) throws Exception {
+ log.info("ERP鍙栨秷浠诲姟锛�"+ param);
+ JSONObject jsonObject = JSONObject.parseObject(param);//灏嗗弬鏁拌浆鍖栦负JSON鏍煎紡
+ String inter = jsonObject.getString("data");
+ List<InterData> list = JSONArray.parseArray(inter, InterData.class);//鑾峰彇鍙傛暟闆嗗悎
+ JSONObject jsonObject1 = new JSONObject();
+ JSONArray jsonArray = new JSONArray();
+ for (InterData interData : list) {
+ //鏌ヨ瀵瑰簲鍏ュ簱閫氱煡妗ｄ俊鎭�
+ Wrapper wrapper = new EntityWrapper<WaitPakin>().eq("supplier", interData.getFBillNo()).eq("matnr", interData.getFnumber());
+ WaitPakin waitPakin = waitPakinService.selectOne(wrapper);
+
+ if ((interData.getIoType() == 1 && interData.getMatType() == 1) || (interData.getIoType() == 2 && interData.getMatType() == 2)) {
+ if (Cools.isEmpty(waitPakin)) {
+ JSONObject object = new JSONObject();
+ object.put("FInterID", interData.getFInterID());
+ object.put("Fnumber", interData.getFnumber());
+ object.put("code", 500);
+ object.put("msg", "鍗曟嵁涓嶅瓨鍦ㄦ垨鍗曟嵁宸茶鍒犻櫎");
+ jsonArray.add(object);
+ continue;
+ }
+ //鍒ゆ柇鏄惁鏈夊嚭搴撳姩浣� "N"娌℃湁 鈥淵鈥濇湁
+ if (waitPakin.getIoStatus().equals("N")) {
+ //鍒ゆ柇浼犲叆鐨勬暟閲忔槸鍚︿负0鏉ユ墽琛屽垹闄ゆ垨鑰呬慨鏀�
+ if (interData.getFQty().compareTo(BigDecimal.ZERO) == 0) {
+ waitPakinService.delete(wrapper);
+ JSONObject object = new JSONObject();
+ object.put("Fnumber", interData.getFnumber());
+ object.put("FInterID", interData.getFInterID());
+ object.put("code", 200);
+ object.put("msg", "鍒犻櫎鎴愬姛");
+ jsonArray.add(object);
+ } else {
+ waitPakin.setAnfme(interData.getFQty().doubleValue());
+ waitPakinService.update(waitPakin, wrapper);
+ JSONObject object = new JSONObject();
+ object.put("Fnumber", interData.getFnumber());
+ object.put("FInterID", interData.getFInterID());
+ object.put("code", 200);
+ object.put("msg", "淇敼鎴愬姛");
+ jsonArray.add(object);
+ }
+
+ } else {
+ JSONObject object = new JSONObject();
+ object.put("FInterID", interData.getFInterID());
+ object.put("Fnumber", interData.getFnumber());
+ object.put("code", 500);
+ object.put("msg", "宸插湪鍏ュ簱涓紝鏃犳硶鍙栨秷");
+ jsonArray.add(object);
+ }
+ }
+
+ if (interData.getIoType() == 3) {
+ Wrapper wrapper1 = new EntityWrapper<OutStockBillEntry>().eq("FInterID", interData.getFInterID()).and().eq("Fnumber", interData.getFnumber());
+ OutStockBillEntry outStockBillEntry = outStockService.selectOne(wrapper1);
+ if (Cools.isEmpty(outStockBillEntry)) {
+ JSONObject object = new JSONObject();
+ object.put("FInterID", interData.getFInterID());
+ object.put("Fnumber", interData.getFnumber());
+ object.put("code", 500);
+ object.put("msg", "鍗曟嵁涓嶅瓨鍦ㄦ垨鍗曟嵁宸茶鍒犻櫎");
+ jsonArray.add(object);
+ continue;
+ }
+ //鍒ゆ柇鍑哄簱鏁伴噺鍥炰紶瀛楁鍜屽嚭搴撴暟閲忓瓧娈垫槸鍚︿负0
+ if (outStockBillEntry.getFAuxCommitQty().compareTo(BigDecimal.ZERO) == 0 && outStockBillEntry.getFAmount().compareTo(BigDecimal.ZERO) == 0) {
+ //鍒ゆ柇浼犲叆鐨勬暟閲忔槸鍚︿负0鏉ユ墽琛屽垹闄ゆ垨鑰呬慨鏀�
+ if (interData.getFQty().compareTo(BigDecimal.ZERO) == 0) {
+ outStockService.delete(wrapper1);
+ JSONObject object = new JSONObject();
+ object.put("Fnumber", interData.getFnumber());
+ object.put("FInterID", interData.getFInterID());
+ object.put("code", 200);
+ object.put("msg", "鍒犻櫎鎴愬姛");
+ jsonArray.add(object);
+ } else {
+ outStockBillEntry.setFAuxQty(interData.getFQty());
+ outStockService.update(outStockBillEntry, wrapper1);
+ JSONObject object = new JSONObject();
+ object.put("Fnumber", interData.getFnumber());
+ object.put("FInterID", interData.getFInterID());
+ object.put("code", 200);
+ object.put("msg", "淇敼鎴愬姛");
+ jsonArray.add(object);
+ }
+ } else {
+ if (outStockBillEntry.getFAuxCommitQty().compareTo(BigDecimal.ZERO) > 0) {
+ JSONObject object = new JSONObject();
+ object.put("Fnumber", interData.getFnumber());
+ object.put("FInterID", interData.getFInterID());
+ object.put("code", 500);
+ object.put("msg", "宸插湪鍑哄簱涓紝鏃犳硶鍙栨秷");
+ jsonArray.add(object);
+ }
+ }
+ }
+ if (Cools.isEmpty(jsonArray)) {
+ JSONObject object = new JSONObject();
+ object.put("Fnumber", interData.getFnumber());
+ object.put("FInterID", interData.getFInterID());
+ object.put("code", 500);
+ object.put("msg", "鍗曟嵁鏈夐敊璇紝璇锋牳瀵�");
+ jsonArray.add(object);
+ }
+ }
+
+ jsonObject1.put("data", jsonArray);
+ return jsonObject1;
+
+ }
+// if (Cools.isEmpty(param.getIoType())) {
+// return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
+// }
+// if (Cools.isEmpty(param.getSourceStaNo())) {
+// return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
+// }
+// List<WaitPakin> waitPakins = new ArrayList<WaitPakin>();
+// if (param.getIoType() == 1) {
+// if (Cools.isEmpty(param.getBarcode())) {
+// return R.error("鏉＄爜涓嶈兘涓虹┖");
+// }
+//// waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+//// if (Cools.isEmpty(waitPakins)) {
+//// return R.error("鏉＄爜鏁版嵁閿欒");
+//// }
+// int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
+// int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
+// if (countLoc > 0 || countWrk > 0) {
+// return R.error("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�");
+// }
+// }
+// if (Cools.isEmpty(param.getLocType1())){
+// return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
+// }
+//
+// LocTypeDto locTypeDto = new LocTypeDto();
+// locTypeDto.setLocType1(param.getLocType1());
+//
+// StartupDto dto = null;
+// switch (param.getIoType()) {
+// case 1:
+// WaitPakin waitPakin = new WaitPakin();
+// waitPakin.setMatnr(param.getBarcode());
+// waitPakin.setAnfme(1D);
+// waitPakins.add(waitPakin);
+// dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
+// break;
+// case 10:
+// dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto);
+// break;
+// default:
+// break;
+// }
+
+
+}
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a5abf76..e44999a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,14 +1,14 @@
server:
port: 8081
servlet:
- context-path: /@pom.build.finalName@
+ context-path: /xtywms
spring:
application:
- name: @pom.build.finalName@
+ name: xtywms
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# url: jdbc:sqlserver://192.168.4.208:1433;databasename=xtyasrs
+ # url: jdbc:sqlserver://192.168.4.208:1433;databasename=xtyasrs
url: jdbc:sqlserver://localhost:1433;databasename=xtyasrs
username: sa
password: sa@123
@@ -18,7 +18,7 @@
host: localhost
port: 6379
database: 0
-# password: xltys1995
+ # password: xltys1995
servlet:
multipart:
maxFileSize: 100MB
@@ -34,7 +34,7 @@
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
logging:
- path: /stock/out/@pom.build.finalName@/logs
+ path: /stock/out/xtywms/logs
super:
pwd: xltys1995
@@ -46,7 +46,7 @@
db:
driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
ur: jdbc:sqlserver://192.168.0.253:1433;databasename=xtyasrs_dual
-# ur: jdbc:sqlserver://192.168.4.208:1433;databasename=xtyasrs_dual
+ # ur: jdbc:sqlserver://192.168.4.208:1433;databasename=xtyasrs_dual
username: sa
password: sa@123
--
Gitblit v1.9.1