预验收退库修改

单据提交失败问题
UDI码缺失问题
12 changed files with 79 additions and 26 deletions
--- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
@ -1,5 +1,6 @@
 package com.glxp.api.controller.basic;

+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
@ -234,7 +235,7 @@ public class UdiRelevanceController extends BaseController {
            for (UdiProductEntity udiProductEntity : udiInfoEntities) {
                UdiRelevanceResponse udiRelevanceResponse = new UdiRelevanceResponse();
                BeanUtils.copyProperties(udiProductEntity, udiRelevanceResponse);
-                BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceResponse);
+                BeanUtil.copyProperties(udiRelevanceEntity, udiRelevanceResponse);
                udiRelevanceResponses.add(udiRelevanceResponse);
            }
        }
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@ -497,7 +497,7 @@ public class IoCodeTempController extends BaseController {


        //校验预验收是否已存在
-        if (bussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_PREIN) {
+        if (bussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_PREIN && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
            if (StrUtil.isNotEmpty(udiEntity.getSerialNo())) {
                int count = invPreinProductDetailService.findCountByCode(code);
                if (count > 0) {
@ -586,9 +586,9 @@ public class IoCodeTempController extends BaseController {

                BaseResponse invRes = null;
                if (bussinessTypeEntity.isScanPreIn()) {    //校验预验收库存
-                    invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity,false);
+                    invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity, false);
                } else if (bussinessTypeEntity.isAdvancePreIn()) {  //校验寄售库存
-                    invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity,false);
+                    invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity, false);
                } else {
                    invRes = checkInv(bussinessTypeEntity, genDetaiEntity, false);
                }
@ -742,13 +742,13 @@ public class IoCodeTempController extends BaseController {


            if (bussinessTypeEntity.isScanPreIn()) {    //校验预验收库存
-                BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity,false);
+                BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity, false);
                if (invRes != null) {
                    deleteEmptyBillNo(orderEntity);
                    return invRes;
                }
            } else if (bussinessTypeEntity.isAdvancePreIn()) {  //校验寄售库存
-                BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity,false);
+                BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity, false);
                if (invRes != null) {
                    deleteEmptyBillNo(orderEntity);
                    return invRes;
@ -1234,12 +1234,15 @@ public class IoCodeTempController extends BaseController {


    public void deleteEmptyBillNo(IoOrderEntity orderEntity) {
-        boolean r1 = orderDetailBizService.isExit(orderEntity.getBillNo());
-        boolean r2 = ioOrderDetailCodeService.isExit(orderEntity.getBillNo());
-        boolean r3 = codeTempService.isExit(orderEntity.getBillNo());
-        if (!r1 && !r2 && !r3) {
-            orderService.deleteByBillNo(orderEntity.getBillNo());
+        if (orderEntity != null) {
+            boolean r1 = orderDetailBizService.isExit(orderEntity.getBillNo());
+            boolean r2 = ioOrderDetailCodeService.isExit(orderEntity.getBillNo());
+            boolean r3 = codeTempService.isExit(orderEntity.getBillNo());
+            if (!r1 && !r2 && !r3) {
+                orderService.deleteByBillNo(orderEntity.getBillNo());
+            }
        }
+
    }


@ -1485,7 +1488,7 @@ public class IoCodeTempController extends BaseController {


        //校验预验收是否已存在
-        if (bussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_PREIN) {
+        if (bussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_PREIN && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
            if (StrUtil.isNotEmpty(udiEntity.getSerialNo())) {
                int count = invPreinProductDetailService.findCountByCode(code);
                if (count > 0) {
@ -1574,9 +1577,9 @@ public class IoCodeTempController extends BaseController {

                BaseResponse invRes = null;
                if (bussinessTypeEntity.isScanPreIn()) {    //校验预验收库存
-                    invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity,false);
+                    invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity, false);
                } else if (bussinessTypeEntity.isAdvancePreIn()) {  //校验寄售库存
-                    invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity,false);
+                    invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity, false);
                } else {
                    invRes = checkInv(bussinessTypeEntity, genDetaiEntity, false);
                }
@ -1729,13 +1732,13 @@ public class IoCodeTempController extends BaseController {


            if (bussinessTypeEntity.isScanPreIn()) {    //校验预验收库存
-                BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity,false);
+                BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity, false);
                if (invRes != null) {
                    deleteEmptyBillNo(orderEntity);
                    return invRes;
                }
            } else if (bussinessTypeEntity.isAdvancePreIn()) {  //校验寄售库存
-                BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity,false);
+                BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity, false);
                if (invRes != null) {
                    deleteEmptyBillNo(orderEntity);
                    return invRes;
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
@ -317,7 +317,11 @@ public class IoOrderController extends BaseController {
                basicCorpEntity.setId(IdUtil.getSnowflakeNextId());
                basicCorpService.insert(basicCorpEntity);
            }
-            orderEntity.setFromCorp(basicCorpEntity.getErpId());
+            if (addOrderRequest.getAction().equals(bussinessTypeEntity.getAction())){
+                orderEntity.setFromCorp(basicCorpEntity.getName());
+            }else {
+                orderEntity.setFromCorp(basicCorpEntity.getErpId());
+            }
        } else {
            orderEntity.setFromCorp(addOrderRequest.getFromCorp());
        }
--- a/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java
+++ b/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java
@ -6,12 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

+import java.io.Serializable;
 import java.util.Date;


@Data
@TableName(value = "io_code_temp")
-public class IoCodeTempEntity {
+public class IoCodeTempEntity implements Serializable {
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

--- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
@ -253,6 +253,8 @@ public class IoOrderResponse {
            return fromCorpName;
        if (StrUtil.isNotEmpty(fromInvName))
            return fromInvName;
+        if (StrUtil.isNotEmpty(fromCorp))
+            return fromCorp;
        return fromName;
    }

--- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
@ -617,7 +617,7 @@ public class IoAddInoutService {
        int count = 0;
        if (filterList != null) {
            for (IoCodeTempEntity temp : filterList) {
-                if (temp.getCode().equals(codeEntity.getCode())) {
+                if (temp.getCode().equals(codeEntity.getCode()) && StrUtil.trimToEmpty(temp.getSerialNo()).equals(StrUtil.trimToEmpty(codeEntity.getSerialNo()))) {
                    count = count + 1;
                }
            }
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
@ -893,7 +893,7 @@ public class IoOrderServiceImpl implements IoOrderService {
                return ResultVOUtils.success("提交成功");
            } else {
                log.error("----单据上传----" + billNo + baseResponse.getMessage());
-                return ResultVOUtils.error(500, "提交失败");
+                return ResultVOUtils.error(500, baseResponse.getMessage() == null ? "提交失败" : baseResponse.getMessage());
            }
        }
    }
--- a/src/main/java/com/glxp/api/service/sync/HeartService.java
+++ b/src/main/java/com/glxp/api/service/sync/HeartService.java
@ -1910,7 +1910,7 @@ public class HeartService {
            for (IoCodeEntity warehouseEntity : warehouseEntityList) {
                if (warehouseEntity.getOrderId().equals(orderEntity.getBillNo())) {
                    IoCodeTempEntity codeTempEntity = new IoCodeTempEntity();
-                    BeanUtils.copyProperties(warehouseEntity, codeTempEntity);
+                    BeanUtil.copyProperties(warehouseEntity, codeTempEntity);
                    codeTempEntity.setId(null);
                    codeTempService.insert(codeTempEntity);
                }
--- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
@ -6,11 +6,14 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.dao.basic.UdiRelevanceDao;
 import com.glxp.api.dao.thrsys.ThrProductsDao;
+import com.glxp.api.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
 import com.glxp.api.http.ErpBasicClient;
@ -19,7 +22,10 @@ import com.glxp.api.req.thrsys.PostThrProductsRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.res.thrsys.ThrProductsResponse;
+import com.glxp.api.service.basic.UdiContrastService;
+import com.glxp.api.service.system.SystemParamConfigService;
 import com.glxp.api.service.thrsys.ThrProductsService;
+import com.glxp.api.util.IntUtil;
 import com.glxp.api.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.session.ExecutorType;
@ -53,6 +59,8 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
    private ErpBasicClient erpBasicClient;
    @Resource
    private SqlSessionFactory sqlSessionFactory;
+    @Resource
+    SystemParamConfigService systemParamConfigService;

    @Override
    public ThrProductsEntity selectByCode(String code) {
@ -169,6 +177,12 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
        return ResultVOUtils.success("第三方系统产品数据已插入到数据库");
    }

+
+    @Resource
+    UdiContrastService udiContrastService;
+    @Resource
+    UdiRelevanceDao udiRelevanceDao;
+
    @Override
    public BaseResponse downloadThrPi(ThrSystemDetailEntity thrSystemDetailEntity) {
        int page = 1;
@ -194,6 +208,18 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
                        thrProductsEntity.setId(IdUtil.getSnowflakeNextId());
                        thrProductsEntity.setThirdSysFk(thrSystemDetailEntity.getThirdSysFk());
                        thrProductsDao.insertThrProducts(thrProductsEntity);
+
+                        if (StrUtil.isNotEmpty(thrSystemDetailEntity.getThirdSysFk()) && thrSystemDetailEntity.getThirdSysFk().equals("thirdId")) {
+                            String value = systemParamConfigService.selectValueByParamKey("update_third_in_rel");
+                            if (IntUtil.value(value) == 1) {
+                                boolean isExit = udiRelevanceDao.exists(new QueryWrapper<UdiRelevanceEntity>().eq("mainId", thrProductsEntity.getCode()));
+                                if (!isExit) {
+                                    udiContrastService.createOnlyMainId(thrProductsEntity.getCode());
+                                }
+                            }
+                        }
+
+
                    } else {
                        boolean isChange = verifyDataChange(thrProductsEntity, item);
                        if (isChange) {
--- a/src/main/java/com/glxp/api/util/IntUtil.java
+++ b/src/main/java/com/glxp/api/util/IntUtil.java
@ -1,5 +1,7 @@
 package com.glxp.api.util;

+import cn.hutool.core.util.StrUtil;
+
 public class IntUtil {

    public static int value(Integer value) {
@ -23,4 +25,11 @@ public class IntUtil {
        else return value;
    }

+    public static int value(String value) {
+        if (StrUtil.isEmpty(value))
+            return 0;
+        else return Integer.parseInt(value);
+
+    }
+
 }
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@ -4,7 +4,7 @@ server:
 spring:
  datasource:
    driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.43:3306/udi_wms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
    username: root
    password: 123456
    hikari:
--- a/src/main/resources/schemas/schema_v2.2.sql
+++ b/src/main/resources/schemas/schema_v2.2.sql
@ -8,8 +8,8 @@ CREATE TABLE IF NOT EXISTS `device_inspect_task`
    `deptCode`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '部门',
    `invCode`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '仓库',
    `code`          varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '资产编码',
-    `status`        int                                                           NULL DEFAULT NULL COMMENT  '状态',
-    `type`          int                                                           NULL DEFAULT NULL COMMENT  '类型',
+    `status`        int                                                           NULL DEFAULT NULL COMMENT '状态',
+    `type`          int                                                           NULL DEFAULT NULL COMMENT '类型',
    `inspectUser`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检人',
    `remindTime`    datetime(0)                                                   NULL DEFAULT NULL COMMENT '提醒时间',
    `remark`        varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检备注',
@ -32,7 +32,7 @@ CREATE TABLE IF NOT EXISTS `device_inspect_task_detail`
    `id`             int                                                           NOT NULL AUTO_INCREMENT,
    `projectCode`    varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检项目编码',
    `projectContent` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检内容',
-    `status`         int                                                            NULL DEFAULT NULL COMMENT '状态（1：未开始；2：已检查；3：异常；4：不巡检',
+    `status`         int                                                           NULL DEFAULT NULL COMMENT '状态（1：未开始；2：已检查；3：异常；4：不巡检',
    `result`         varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检结果备注',
    `inspectImage`   varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检图片',
    `inspectUser`    varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检人',
@ -85,7 +85,14 @@ CALL Pro_Temp_ColumnWork('device_inspect_plan', 'planStatus', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('device_inspect_plan', 'inspectUser', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('device_inspect_plan', 'lastTime', 'datetime', 1);
 CALL Pro_Temp_ColumnWork('device_inspect_plan', 'nextTime', 'datetime', 1);
-INSERT ignore INTO  `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) VALUES (2088, 0, '是否只校验批次号', 'only_vail_batch', '0', 0, 0, '是否只校验批次号(0：否；1：是)', NULL);
+INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`,
+                                      `paramType`, `paramExplain`, `updateTime`)
+VALUES (2088, 0, '是否只校验批次号', 'only_vail_batch', '0', 0, 0, '是否只校验批次号(0：否；1：是)', NULL);

 CALL Pro_Temp_ColumnWork('device_inspect_task', 'repairType', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('device_inspect_task', 'level', 'tinyint', 1);
+
+
+INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`,
+                                      `paramType`, `paramExplain`, `updateTime`)
+VALUES (2090, 0, '更新第三方产品信息是否选入耗材字典', 'update_third_in_rel', '0', 0, 0, '更新第三方产品信息是否选入耗材字典(0：否；1：是)', NULL);
Author	SHA1	Message	Date
anthonywj	2ca4b0ff63	预验收退库修改	2 years ago
anthonywj	fadde62a55	单据提交失败问题	2 years ago
anthonywj	4b51aaa079	UDI码缺失问题	2 years ago
anthonywj	01af4444ca	条码重复问题	2 years ago
anthonywj	26d1180d2e	切换分支备份	2 years ago
anthonywj	071efcdc89	诊断第三方产品信息定时选入时，自动添加到耗材字典	2 years ago
anthonywj	e6073049e3	Merge remote-tracking branch 'origin/dev' into dev	2 years ago
黄泽腾	bc54916798	中医院往来单位代码备份	2 years ago
anthonywj	092baca3a0	切换分支备份	2 years ago