From 227627ccc8386ba9fb8202d0061e031c91445b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Fri, 14 Apr 2023 10:42:57 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=8B=89?=
=?UTF-8?q?=E5=8F=96=E9=83=A8=E9=97=A8=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/glxp/api/controller/auth/DeptController.java | 1 +
.../java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java | 1 +
src/main/resources/mybatis/mapper/auth/DeptDao.xml | 4 +++-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/glxp/api/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java
index 4537b6ad..bc3185f1 100644
--- a/src/main/java/com/glxp/api/controller/auth/DeptController.java
+++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java
@@ -162,6 +162,7 @@ public class DeptController extends BaseController {
List<DeptEntity> invWarehouseEntities;
AuthAdmin authAdmin = customerService.getUserBean();
if (authAdmin.getCustomerId().equals("110")) {
+ filterInvWarehouseRequest.setCustomerId("110");
filterInvWarehouseRequest.setUserId(authAdmin.getId());
} else {
filterInvWarehouseRequest.setUserId(null);
diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java
index e41d2354..7d9f0906 100644
--- a/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java
+++ b/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java
@@ -31,4 +31,5 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
private String superiorCode;//上级
private String subordinateCode;//下级
private String superiorPcode;//上级
+ private String CustomerId;
}
diff --git a/src/main/resources/mybatis/mapper/auth/DeptDao.xml b/src/main/resources/mybatis/mapper/auth/DeptDao.xml
index d7e3ad76..3fbaaef2 100644
--- a/src/main/resources/mybatis/mapper/auth/DeptDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/DeptDao.xml
@@ -47,7 +47,9 @@
resultType="com.glxp.api.entity.auth.DeptEntity">
select auth_dept.* from auth_dept INNER JOIN auth_warehouse
on auth_dept.`code` =auth_warehouse.parentId
- INNER JOIN auth_warehouse_user on auth_warehouse_user.`code` = auth_warehouse.code
+ <if test="CustomerId != '' and CustomerId != null">
+ INNER JOIN auth_warehouse_user on auth_warehouse_user.`code` = auth_warehouse.code
+ </if>
<where>
<if test="id != '' and id != null">
AND id = #{id}
From 88f8db9a69ce15cdb0cd771bb8832c092d06255e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Fri, 14 Apr 2023 13:49:05 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=89=A9?=
=?UTF-8?q?=E8=B4=A8=E7=94=B3=E8=AF=B7=E5=AE=A1=E6=A0=B8=E9=97=AE=E9=A2=98?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/controller/thrsys/ThrProductsAddDiController.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
index eff18821..920353ee 100644
--- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
+++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
@@ -174,9 +174,6 @@ public class ThrProductsAddDiController {
}
- thrProductsAddDiEntity.setAuditTime(new Date());
- thrProductsAddDiEntity.setAuditUser(customerService.getUserId() + "");
- thrProductsAddDiService.updateDiProduct(thrProductsAddDiEntity);
thrProductsAddDiEntity = thrProductsAddDiService.selecById(thrProductsAddDiEntity.getId());
@@ -256,6 +253,9 @@ public class ThrProductsAddDiController {
}
}
+ thrProductsAddDiEntity.setAuditTime(new Date());
+ thrProductsAddDiEntity.setAuditUser(customerService.getUserId() + "");
+ thrProductsAddDiService.updateDiProduct(thrProductsAddDiEntity);
}
return ResultVOUtils.success("更新成功");
From 42441fa44931212ce3917636b96ed08d594beef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Fri, 14 Apr 2023 14:05:26 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=89=A9?=
=?UTF-8?q?=E8=B4=A8=E7=94=B3=E8=AF=B7=E5=AE=A1=E6=A0=B8=E9=97=AE=E9=A2=98?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/thrsys/ThrProductsAddDiController.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
index 920353ee..fea2c921 100644
--- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
+++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
@@ -173,14 +173,16 @@ public class ThrProductsAddDiController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
-
+ Integer status=thrProductsAddDiEntity.getStatus();
+ thrProductsAddDiEntity.setAuditTime(new Date());
+ thrProductsAddDiEntity.setAuditUser(customerService.getUserId() + "");
thrProductsAddDiEntity = thrProductsAddDiService.selecById(thrProductsAddDiEntity.getId());
//自增的数据就再到第三方产品里面
ThrProductsAddDiResponse thrProductsAddDiResponse = thrProductsAddDiService.selecById(thrProductsAddDiEntity.getId());
- if (thrProductsAddDiEntity.getStatus() == 2) { //审核通过
+ if (status == 2) { //审核通过
//第三方产品审核通过
if (thrProductsAddDiEntity.getType() == 2) {
ThrProductsEntity thrProductsEntity = new ThrProductsEntity();
@@ -253,10 +255,7 @@ public class ThrProductsAddDiController {
}
}
- thrProductsAddDiEntity.setAuditTime(new Date());
- thrProductsAddDiEntity.setAuditUser(customerService.getUserId() + "");
thrProductsAddDiService.updateDiProduct(thrProductsAddDiEntity);
-
}
return ResultVOUtils.success("更新成功");
}
From e499c9db45b7037e81ef1de9dc38a9cf92e76f3f Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 14 Apr 2023 14:16:17 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98?=
=?UTF-8?q?=EF=BC=8C=E5=8D=95=E6=8D=AE=E6=92=A4=E5=9B=9E=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sync/SpsSyncDownloadController.java | 7 ++-
.../api/idc/service/impl/IdcServiceImpl.java | 54 +++++++++----------
.../inout/impl/IoOrderServiceImpl.java | 2 +-
3 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
index 46e7df52..2ac133ff 100644
--- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
+++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
@@ -244,7 +244,6 @@ public class SpsSyncDownloadController {
orderEntity.setId(null);
purOrderService.insert(orderEntity);
if (CollUtil.isNotEmpty(spsSyncBusOrderResponse.getPurOrderDetailEntities())) {
-
List<PurOrderDetailEntity> purOrderDetailEntities = spsSyncBusOrderResponse.getPurOrderDetailEntities();
for (PurOrderDetailEntity purOrderDetailEntity : purOrderDetailEntities) {
PurOrderDetailEntity codeTempEntity = new PurOrderDetailEntity();
@@ -278,5 +277,11 @@ public class SpsSyncDownloadController {
}
+ //接收中继服务、UDI管理系统上传单据类型
+
+
+ //接收中继服务、UDI管理系统上传基础信息
+
+
}
diff --git a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java
index 64cd7231..81a9e73c 100644
--- a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java
+++ b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java
@@ -203,7 +203,7 @@ public class IdcServiceImpl implements IdcService {
}
}
-
+
private void fetchFailFile(String host) {
Map<String,Object> map = new HashMap<String,Object>();
map.put("sql", "select * from idc_file where createTime<date_sub(now(),interval 30 minute) order by createTime");
@@ -579,7 +579,7 @@ public class IdcServiceImpl implements IdcService {
Map<String, Object> whereParams = new HashMap<String, Object>();
whereParams.put("sqlWhere", params.get("sqlWhere"));
-
+
String dataWhere = params.get("dataWhere")!=null ? params.get("dataWhere").toString() : "";
Map<String, Object> map = new HashMap<String, Object>();
String where = DBAUtils.convertWhere(column, whereParams, dataWhere);
@@ -811,7 +811,7 @@ public class IdcServiceImpl implements IdcService {
private boolean analyToDB(String host, String tableName, String uniqueColumn, String
filePathColumn, List<Map<String, Object>> list, boolean isUpload) {
-
+
String tName = DBAUtils.tableRealName(tableName);
String sql = "replace " + tName + "(";
String del = "delete from " + tName + " where ";
@@ -1034,27 +1034,27 @@ public class IdcServiceImpl implements IdcService {
int total = 0;
if (result!=null&&result.isSuccessful()&&MediaType.parse("application/force-download").equals(result.body().contentType())) {
try (InputStream inputStream = result.body().byteStream()) {
-
-
-
- FileOutputStream outputStream = new FileOutputStream(filePath + filePathSlash + imagePath+fileName);
-
- byte b[] = new byte[1024];
-
- int len = 0;
- while ((len = inputStream.read(b)) != -1) {
- total += len;
- outputStream.write(b, 0, len);
-
- }
-
- outputStream.flush();
- outputStream.close();
- if(!(total>0)) {
- new File(filePath + filePathSlash + imagePath+fileName).delete();
- executeSql("delete from idc_file where filePath='"+fileName+"'");
- }
-
+
+
+
+ FileOutputStream outputStream = new FileOutputStream(filePath + filePathSlash + imagePath+fileName);
+
+ byte b[] = new byte[1024];
+
+ int len = 0;
+ while ((len = inputStream.read(b)) != -1) {
+ total += len;
+ outputStream.write(b, 0, len);
+
+ }
+
+ outputStream.flush();
+ outputStream.close();
+ if(!(total>0)) {
+ new File(filePath + filePathSlash + imagePath+fileName).delete();
+ executeSql("delete from idc_file where filePath='"+fileName+"'");
+ }
+
} catch (Exception e) {
@@ -1252,7 +1252,7 @@ public class IdcServiceImpl implements IdcService {
}
-
+
private void executeSql(String sql) {
try {
jdbcTemplate.execute(sql);
@@ -1262,5 +1262,5 @@ public class IdcServiceImpl implements IdcService {
}
}
-
-}
\ No newline at end of file
+
+}
diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
index 939f764b..b78f8d0c 100644
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
@@ -412,7 +412,7 @@ public class IoOrderServiceImpl implements IoOrderService {
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
- orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_SUCCESS);
+ orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
orderEntity.setUpdateTime(new Date());
update(orderEntity);
return true;
From d5153119f10302ce5b8b7d8453ce4d0d53a24fcc Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 14 Apr 2023 15:06:43 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=A9=BA=E5=8D=95?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/controller/auth/DeptController.java | 32 +++++++++----------
.../inout/IoCodeTempController.java | 8 +++++
.../inout/IoOrderDetailBizController.java | 17 ++++++++--
3 files changed, 39 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/glxp/api/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java
index bc3185f1..7adbd3a8 100644
--- a/src/main/java/com/glxp/api/controller/auth/DeptController.java
+++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java
@@ -250,12 +250,12 @@ public class DeptController extends BaseController {
}
//判断状态
- String msg=isCheckStatus(deptEntity.getStatus(),deptEntity);
- if(msg!=""){
- return ResultVOUtils.error(999,msg);
+ String msg = isCheckStatus(deptEntity.getStatus(), deptEntity);
+ if (msg != "") {
+ return ResultVOUtils.error(999, msg);
}
//判断供应商状态
- if(deptEntity.isSpUse()==false){
+ if (deptEntity.isSpUse() == false) {
FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust();
filterDeptUserReqeust.setDeptId(deptEntity.getId().longValue());
List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust);
@@ -295,8 +295,8 @@ public class DeptController extends BaseController {
}
DeptEntity deptEntity = deptService.selectById(deleteRequest.getId());
- if(deptEntity.getLevel()!=null && deptEntity.getLevel() == 1){
- return ResultVOUtils.error(500,"删除失败，一级部门不允许删除！");
+ if (deptEntity.getLevel() != null && deptEntity.getLevel() == 1) {
+ return ResultVOUtils.error(500, "删除失败，一级部门不允许删除！");
}
List<InvWarehouseEntity> invSubWarehouseEntities = invWarehouseService.findByParentId(deptEntity.getCode());
@@ -310,7 +310,7 @@ public class DeptController extends BaseController {
return ResultVOUtils.error(500, "删除失败，请先移除该部门关联用户信息！");
}
List<DeptEntity> deptEntities = deptService.selectByPcode(deptEntity.getCode());
- if(deptEntities.size()>0){
+ if (deptEntities.size() > 0) {
return ResultVOUtils.error(500, "删除失败，请先移除该部门下的子部门！");
}
@@ -366,20 +366,20 @@ public class DeptController extends BaseController {
return ResultVOUtils.success(list);
}
- public String isCheckStatus(Integer status,DeptEntity deptEntity){
+ public String isCheckStatus(Integer status, DeptEntity deptEntity) {
//启用的时候需要判断上级是不是被禁用
- if(status==1){
+ if (status == 1) {
//查询所有的上级
- List<DeptEntity> deptEntityList= deptService.selectupDeptAll(deptEntity.getPcode());
- for(DeptEntity obj:deptEntityList){
- if(obj.getStatus()==0){
+ List<DeptEntity> deptEntityList = deptService.selectupDeptAll(deptEntity.getPcode());
+ for (DeptEntity obj : deptEntityList) {
+ if (obj.getStatus() == 0) {
return "上级存在禁用的部门修改失败！";
}
}
- }else{
- List<DeptEntity> deptEntityList= deptService.selectLowDeptAll(deptEntity.getCode());
- for(DeptEntity obj:deptEntityList){
- if(obj.getStatus()==1){
+ } else {
+ List<DeptEntity> deptEntityList = deptService.selectLowDeptAll(deptEntity.getCode());
+ for (DeptEntity obj : deptEntityList) {
+ if (obj.getStatus() == 1) {
return "下级存在启用的部门修改失败！";
}
}
diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index 89e6c82a..25a23b89 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -647,6 +647,7 @@ public class IoCodeTempController extends BaseController {
boolean isBillExit = orderDetailBizService.isExit(orderEntity.getBillNo());
if (!isBillExit) {
+ orderService.deleteByBillNo(orderEntity.getBillNo());
return ResultVOUtils.error(500, "请先录入业务详情");
}
}
@@ -960,6 +961,13 @@ public class IoCodeTempController extends BaseController {
}
}
+
+ boolean r1 = orderDetailBizService.isExit(orderDetailCodeEntity.getOrderIdFk());
+ boolean r2 = ioOrderDetailCodeService.isExit(orderDetailCodeEntity.getOrderIdFk());
+ if (!r1 && !r2) {
+ orderService.deleteByBillNo(orderDetailCodeEntity.getOrderIdFk());
+ }
+
orderEntity.setUpdateUser(getUserId() + "");
orderEntity.setUpdateTime(new Date());
orderService.update(orderEntity);
diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
index 54f84451..6fc1b21c 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
@@ -121,7 +121,8 @@ public class IoOrderDetailBizController extends BaseController {
if (addBizProductReqeust.getOrderEntity() == null)
return ResultVOUtils.error(500, "未指定订单");
IoOrderEntity orderEntity = addBizProductReqeust.getOrderEntity();
- if (StrUtil.isEmpty(orderEntity.getBillNo())) {
+ IoOrderEntity isExit = orderService.findByBillNo(orderEntity.getBillNo());
+ if (StrUtil.isEmpty(orderEntity.getBillNo()) || isExit == null) {
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode());
String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd"));
@@ -472,7 +473,19 @@ public class IoOrderDetailBizController extends BaseController {
@PostMapping("/udiwms/inout/order/delBizProduct")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse delBizProduct(@RequestBody DeleteRequest deleteRequest) {
- return orderDetailBizService.deleteById(Integer.parseInt(deleteRequest.getId())) > 0 ? ResultVOUtils.success("删除成功！") : ResultVOUtils.error(500, "删除失败");
+ IoOrderDetailBizEntity orderDetailBizEntity = orderDetailBizService.selectById(Integer.parseInt(deleteRequest.getId()));
+ int result = orderDetailBizService.deleteById(Integer.parseInt(deleteRequest.getId()));
+ if (result > 0) {
+ boolean r1 = orderDetailBizService.isExit(orderDetailBizEntity.getOrderIdFk());
+ boolean r2 = orderDetailCodeService.isExit(orderDetailBizEntity.getOrderIdFk());
+ if (!r1 && !r2) {
+ orderService.deleteByBillNo(orderDetailBizEntity.getOrderIdFk());
+ }
+ return ResultVOUtils.success("删除成功！");
+ }
+ return ResultVOUtils.error(500, "删除失败");
+
+
}
From ffa453ab68051d062c076f07e47c7722385911ae Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 14 Apr 2023 16:21:14 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E6=96=B0=E5=A2=9EUDI=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=9B=B4=E6=8E=A5=E9=AA=8C=E6=94=B6=E5=A4=96?=
=?UTF-8?q?=E7=BD=91=E5=8D=95=E6=8D=AE=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../inout/IoOrderReviewController.java | 30 +++++++++++++++++
.../glxp/api/req/inout/ReviewSpmsRequest.java | 10 ++++++
.../glxp/api/req/sync/SpsSyncDataRequest.java | 1 +
.../glxp/api/res/sync/SpsSyncBusResponse.java | 18 ++++++++++
.../api/res/sync/SpsSyncDataResponse.java | 33 +++++++++++++++++++
.../service/sync/SpsSyncDownloadService.java | 24 +++++++++-----
.../mybatis/mapper/inout/IoOrderDao.xml | 5 +++
7 files changed, 113 insertions(+), 8 deletions(-)
create mode 100644 src/main/java/com/glxp/api/req/inout/ReviewSpmsRequest.java
create mode 100644 src/main/java/com/glxp/api/res/sync/SpsSyncBusResponse.java
create mode 100644 src/main/java/com/glxp/api/res/sync/SpsSyncDataResponse.java
diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
index 819d5b1d..7a438473 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
@@ -20,14 +20,18 @@ import com.glxp.api.entity.inout.*;
import com.glxp.api.entity.system.SystemParamConfigEntity;
import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
import com.glxp.api.req.inout.ReviewFinishRequest;
+import com.glxp.api.req.inout.ReviewSpmsRequest;
import com.glxp.api.req.inout.UpdateExportStatusRequest;
+import com.glxp.api.req.sync.SpsSyncDataRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.inout.AcceptOrderResponse;
import com.glxp.api.res.inout.IoOrderDetailResultResponse;
+import com.glxp.api.res.sync.SpsSyncOrderResponse;
import com.glxp.api.service.auth.AuthAdminService;
import com.glxp.api.service.basic.EntrustReceService;
import com.glxp.api.service.basic.IBasicBussinessTypeService;
import com.glxp.api.service.inout.*;
+import com.glxp.api.service.sync.SpsSyncDownloadService;
import com.glxp.api.service.system.SystemParamConfigService;
import com.glxp.api.util.CustomUtil;
import com.glxp.api.util.GennerOrderUtils;
@@ -414,4 +418,30 @@ public class IoOrderReviewController extends BaseController {
return ResultVOUtils.success("更新成功");
}
+ @Resource
+ SpsSyncDownloadService spsSyncDownloadService;
+
+ // 前端扫单号验收
+ @AuthRuleAnnotation("")
+ @PostMapping("/udiwms/order/reviewSpms")
+ public BaseResponse reviewSpms(@RequestBody ReviewSpmsRequest reviewSpmsRequest) {
+
+ String billNo = reviewSpmsRequest.getBillNo();
+ if (StrUtil.isEmpty(reviewSpmsRequest.getBillNo())) {
+ return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+ }
+
+ IoOrderEntity orderEntity = orderService.findByBillNo(reviewSpmsRequest.getBillNo());
+ if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED) {
+ return ResultVOUtils.error(500, "单据已审核!");
+ } else if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW) {
+ return ResultVOUtils.error(500, "当前单据不处于待审核状态，无法审核！");
+ }
+ SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest();
+ spsSyncDataRequest.setBillNo(reviewSpmsRequest.getBillNo());
+ return spsSyncDownloadService.findOrder(spsSyncDataRequest);
+
+ }
+
+
}
diff --git a/src/main/java/com/glxp/api/req/inout/ReviewSpmsRequest.java b/src/main/java/com/glxp/api/req/inout/ReviewSpmsRequest.java
new file mode 100644
index 00000000..da5ee232
--- /dev/null
+++ b/src/main/java/com/glxp/api/req/inout/ReviewSpmsRequest.java
@@ -0,0 +1,10 @@
+package com.glxp.api.req.inout;
+
+import lombok.Data;
+
+@Data
+public class ReviewSpmsRequest {
+
+ private String billNo;
+
+}
diff --git a/src/main/java/com/glxp/api/req/sync/SpsSyncDataRequest.java b/src/main/java/com/glxp/api/req/sync/SpsSyncDataRequest.java
index bf4f6481..5d5399d8 100644
--- a/src/main/java/com/glxp/api/req/sync/SpsSyncDataRequest.java
+++ b/src/main/java/com/glxp/api/req/sync/SpsSyncDataRequest.java
@@ -6,5 +6,6 @@ import lombok.Data;
@Data
public class SpsSyncDataRequest extends ListPageRequest {
+ private String billNo;
private String lastUpdateTime;
}
diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncBusResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncBusResponse.java
new file mode 100644
index 00000000..a1fb2d0f
--- /dev/null
+++ b/src/main/java/com/glxp/api/res/sync/SpsSyncBusResponse.java
@@ -0,0 +1,18 @@
+package com.glxp.api.res.sync;
+
+import com.glxp.api.entity.basic.BasicBusTypeChangeEntity;
+import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
+import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SpsSyncBusResponse {
+
+ //同步任务ID
+ private String taskId;
+ private List<BasicBussinessTypeEntity> bussinessTypeEntities;
+ private List<BasicBusTypeChangeEntity> busTypeChangeEntities;
+ private List<ThrBusTypeOriginEntity> thrBusTypeOriginEntities;
+}
diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncDataResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncDataResponse.java
new file mode 100644
index 00000000..2ff379cd
--- /dev/null
+++ b/src/main/java/com/glxp/api/res/sync/SpsSyncDataResponse.java
@@ -0,0 +1,33 @@
+package com.glxp.api.res.sync;
+
+import com.glxp.api.entity.auth.*;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SpsSyncDataResponse {
+
+ //同步任务ID
+ private String taskId;
+
+ //用户信息
+ List<AuthAdmin> authAdminList;
+ List<InvBusUserEntity> invBusUserEntities;
+
+ //部门信息
+ List<DeptEntity> deptEntityList;
+ List<DeptUserEntity> deptUserEntities;
+
+
+ //仓库相关
+ List<InvWarehouseEntity> invWarehouseEntities;
+ List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities;
+ List<WarehouseUserEntity> warehouseUserEntities;
+
+
+ //货位信息
+ List<InvSpace> invSpaces;
+
+
+}
diff --git a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java
index 0e3deaab..a664f7f7 100644
--- a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java
+++ b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java
@@ -1,6 +1,7 @@
package com.glxp.api.service.sync;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BasicProcessStatus;
@@ -76,19 +77,26 @@ public class SpsSyncDownloadService {
public BaseResponse findOrder(SpsSyncDataRequest spsSyncDataRequest) {
SpsSyncOrderResponse syncOrderResponse = new SpsSyncOrderResponse();
+
//查询数据同步设置
- SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet();
List<IoOrderEntity> orderEntities = new ArrayList<>();
- FilterOrderRequest orderFilterRequest = new FilterOrderRequest();
- BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest);
- if (CollUtil.isNotEmpty(syncDataSetEntity.getBusTypes())) {
- for (SyncDataBustypeEntity syncDataBustypeEntity : syncDataSetEntity.getBusTypes()) {
- List<IoOrderEntity> temps = orderService.findByStatus(syncDataBustypeEntity.getAction(), syncDataBustypeEntity.getOrderStatus(), DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
- if (CollUtil.isNotEmpty(temps)) {
- orderEntities.addAll(temps);
+ if (StrUtil.isEmpty(spsSyncDataRequest.getBillNo())) {
+ SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet();
+ FilterOrderRequest orderFilterRequest = new FilterOrderRequest();
+ BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest);
+ if (CollUtil.isNotEmpty(syncDataSetEntity.getBusTypes())) {
+ for (SyncDataBustypeEntity syncDataBustypeEntity : syncDataSetEntity.getBusTypes()) {
+ List<IoOrderEntity> temps = orderService.findByStatus(syncDataBustypeEntity.getAction(), syncDataBustypeEntity.getOrderStatus(), DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
+ if (CollUtil.isNotEmpty(temps)) {
+ orderEntities.addAll(temps);
+ }
}
}
+ } else {
+ IoOrderEntity orderEntity = orderService.findByBillNo(spsSyncDataRequest.getBillNo());
+ orderEntities.add(orderEntity);
}
+
syncOrderResponse.setOrderEntities(orderEntities);
List<IoCodeEntity> codeEntities = new ArrayList<>();
List<IoOrderDetailBizEntity> orderDetailBizEntities = new ArrayList<>();
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index a487d249..ba90426c 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -156,6 +156,11 @@
AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and
date_format(#{endTime}, '%Y-%m-%d')
</if>
+ <if test="lastUpdateTime != null and lastUpdateTime != ''">
+ <![CDATA[
+ and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
+ ]]>
+ </if>
</where>
order by createTime desc
</select>
From 8ef2a2ef1cea94aa0b8368734b71ec1510bc565f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Fri, 14 Apr 2023 16:31:31 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8B=89=E5=8F=96?=
=?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/glxp/api/controller/auth/InvWarehouseController.java | 3 +++
.../java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java | 1 +
2 files changed, 4 insertions(+)
diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
index ff8dd7b4..56c7bed4 100644
--- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
+++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
@@ -84,6 +84,9 @@ public class InvWarehouseController extends BaseController {
if (authAdmin.getCustomerId().equals("110")) {
filterInvWarehouseRequest.setUserId(authAdmin.getId());
} else {
+ if(filterInvWarehouseRequest.getType()==1){
+ filterInvWarehouseRequest.setSpUse(true);
+ }
filterInvWarehouseRequest.setUserId(null);
}
diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java
index 7d9f0906..2e87d47c 100644
--- a/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java
+++ b/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java
@@ -32,4 +32,5 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
private String subordinateCode;//下级
private String superiorPcode;//上级
private String CustomerId;
+ private Integer type;
}
From 81fbedcfba57b88b12f36a877728d4f88bd798e6 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 14 Apr 2023 16:50:21 +0800
Subject: [PATCH 08/13] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/glxp/api/req/inv/FilterInvRemindMsgRequest.java | 4 ++++
.../resources/mybatis/mapper/inv/InvRemindMsgDao.xml | 9 ++++++---
src/main/resources/mybatis/mapper/inv/invProductDao.xml | 6 +++---
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvRemindMsgRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvRemindMsgRequest.java
index 9da2dec1..14b8cb8b 100644
--- a/src/main/java/com/glxp/api/req/inv/FilterInvRemindMsgRequest.java
+++ b/src/main/java/com/glxp/api/req/inv/FilterInvRemindMsgRequest.java
@@ -59,4 +59,8 @@ public class FilterInvRemindMsgRequest extends ListPageRequest {
*/
private String supId;
+ /**
+ * 物资名称
+ */
+ private String productName;
}
diff --git a/src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml b/src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml
index bc1d3473..7179c568 100644
--- a/src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml
@@ -28,8 +28,8 @@
(select `name` from auth_space where `code` = irm.invSpaceCode and invCode = irm.invCode) invSpaceName,
(select `name` from basic_corp where erpId = irm.supId) supName
from inv_remind_msg irm
- left join basic_udirel bu on bu.id = irm.relId
- left join basic_products bp on bp.uuid = bu.uuid
+ left join basic_udirel bu on bu.id = irm.relId
+ left join basic_products bp on bp.uuid = bu.uuid
<where>
<if test="relId != null and relId != ''">
AND irm.relId = #{relId}
@@ -50,7 +50,7 @@
AND irm.ignoreStatus = #{ignoreStatus}
</if>
<if test="ggxh != null and ggxh != ''">
- AND bp.ggxh = #{ggxh}
+ AND bp.ggxh like concat('%', #{ggxh}, '%')
</if>
<if test="type != null and type != ''">
AND type = #{type}
@@ -58,6 +58,9 @@
<if test="supId != null">
AND irm.supId = #{supId}
</if>
+ <if test="productName != null and productName != ''">
+ AND bp.cpmctymc like concat('%', #{productName}, '%')
+ </if>
</where>
order by irm.updateTime desc
</select>
diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
index 7243cfaa..7b420be4 100644
--- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
@@ -252,9 +252,9 @@
ip.productionDate,
ip.expireDate,
ip.supId,
- sum(ip.inCount) incount,
- sum(ip.outCount) outCount,
- sum(ip.reCount) reCount
+ ip.inCount,
+ ip.outCount,
+ ip.reCount
from inv_product ip
left join inv_product_detail ipd
on ip.relIdFk = ipd.relId and ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')
From bdd68fdca7b53af7ae073f46411b9d7fd34ee057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Fri, 14 Apr 2023 16:56:19 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=AE=A1=E6=A0=B8?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../glxp/api/controller/thrsys/ThrProductsAddDiController.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
index fea2c921..0154fd8c 100644
--- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
+++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
@@ -254,7 +254,7 @@ public class ThrProductsAddDiController {
}
}
}
-
+ thrProductsAddDiEntity.setStatus(status);
thrProductsAddDiService.updateDiProduct(thrProductsAddDiEntity);
}
return ResultVOUtils.success("更新成功");
From eb1c432b940d01675d1fddaa3b14483f4a088389 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 14 Apr 2023 16:57:36 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/schemas/schema_v2.1.sql | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql
index 5c47c43d..dfde2a43 100644
--- a/src/main/resources/schemas/schema_v2.1.sql
+++ b/src/main/resources/schemas/schema_v2.1.sql
@@ -22,6 +22,11 @@ CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'bindRlIds', 'varchar(255) ', 1)
CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'checkFileName', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('io_order_invoice', 'bizIdFk', 'int ', 1);
+CALL Pro_Temp_ColumnWork('thr_products', 'updateUser', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('thr_products', 'createUser', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('thr_products', 'createTime', 'varchar(255) ', 1);
+
+
CALL Pro_Temp_ColumnWork('auth_warehouse', 'advanceType', 'tinyint', 1);
From 1e11b9b5d3929ef9bbae0192981a23324c904ac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Fri, 14 Apr 2023 17:03:02 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=AE=A1=E6=A0=B8?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../glxp/api/controller/thrsys/ThrProductsAddDiController.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
index 0154fd8c..388345b6 100644
--- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
+++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
@@ -172,7 +172,7 @@ public class ThrProductsAddDiController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
-
+ String remark=thrProductsAddDiEntity.getRemark();
Integer status=thrProductsAddDiEntity.getStatus();
thrProductsAddDiEntity.setAuditTime(new Date());
thrProductsAddDiEntity.setAuditUser(customerService.getUserId() + "");
@@ -254,6 +254,7 @@ public class ThrProductsAddDiController {
}
}
}
+ thrProductsAddDiEntity.setRemark(remark);
thrProductsAddDiEntity.setStatus(status);
thrProductsAddDiService.updateDiProduct(thrProductsAddDiEntity);
}
From ac92524ae9cd500da62bd3eb58c053efec77d096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Fri, 14 Apr 2023 17:25:25 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=AE=A1=E6=A0=B8?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/glxp/api/controller/auth/DeptController.java | 2 +-
.../api/controller/thrsys/ThrProductsAddDiController.java | 4 ++++
src/main/java/com/glxp/api/entity/auth/DeptEntity.java | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/glxp/api/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java
index 7adbd3a8..15391122 100644
--- a/src/main/java/com/glxp/api/controller/auth/DeptController.java
+++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java
@@ -255,7 +255,7 @@ public class DeptController extends BaseController {
return ResultVOUtils.error(999, msg);
}
//判断供应商状态
- if (deptEntity.isSpUse() == false) {
+ if (deptEntity.getSpUse() == false) {
FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust();
filterDeptUserReqeust.setDeptId(deptEntity.getId().longValue());
List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust);
diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
index 388345b6..2a771834 100644
--- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
+++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
@@ -257,6 +257,10 @@ public class ThrProductsAddDiController {
thrProductsAddDiEntity.setRemark(remark);
thrProductsAddDiEntity.setStatus(status);
thrProductsAddDiService.updateDiProduct(thrProductsAddDiEntity);
+ }else {
+ thrProductsAddDiEntity.setRemark(remark);
+ thrProductsAddDiEntity.setStatus(status);
+ thrProductsAddDiService.updateDiProduct(thrProductsAddDiEntity);
}
return ResultVOUtils.success("更新成功");
}
diff --git a/src/main/java/com/glxp/api/entity/auth/DeptEntity.java b/src/main/java/com/glxp/api/entity/auth/DeptEntity.java
index bfd382a0..ac6034d6 100644
--- a/src/main/java/com/glxp/api/entity/auth/DeptEntity.java
+++ b/src/main/java/com/glxp/api/entity/auth/DeptEntity.java
@@ -28,6 +28,6 @@ public class DeptEntity {
private String thirdId3;
private String thirdId4;
- private boolean spUse;
+ private Boolean spUse;
}
From 74e9ab62f817e40b673c694d6068e42da796e896 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 14 Apr 2023 18:28:11 +0800
Subject: [PATCH 13/13] =?UTF-8?q?UDI=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F?=
=?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=AA=8C=E6=94=B6=E5=8D=95=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../glxp/api/controller/inout/IoOrderReviewController.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
index 7a438473..a04da105 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
@@ -421,10 +421,10 @@ public class IoOrderReviewController extends BaseController {
@Resource
SpsSyncDownloadService spsSyncDownloadService;
- // 前端扫单号验收
+ // UDI管理系统获取验收单据信息
@AuthRuleAnnotation("")
- @PostMapping("/udiwms/order/reviewSpms")
- public BaseResponse reviewSpms(@RequestBody ReviewSpmsRequest reviewSpmsRequest) {
+ @PostMapping("/udiwms/order/getReviews")
+ public BaseResponse getReviewOrderSpms(@RequestBody ReviewSpmsRequest reviewSpmsRequest) {
String billNo = reviewSpmsRequest.getBillNo();
if (StrUtil.isEmpty(reviewSpmsRequest.getBillNo())) {