10/22 库存优化

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -365,6 +365,7 @@ public class UdiRelevanceController extends BaseController {
 //        udiRelevanceEntity.setUseLevelDi(udiRelevanceSaveRequest.getUseLevelDi());
 //        udiRelevanceEntity.setUseLevelUnit(udiRelevanceSaveRequest.getUseLevelUnit());
         udiRelevanceEntity.setUseLevel(udiRelevanceSaveRequest.getUseLevel());
+        udiRelevanceEntity.setUnpackUseTime(udiRelevanceSaveRequest.getUnpackUseTime());
 //        udiRelevanceEntity.setDistributeLevelDi(udiRelevanceSaveRequest.getDistributeLevelDi());
 //        udiRelevanceEntity.setDistributeLevelUnit(udiRelevanceSaveRequest.getDistributeLevelUnit());
 //        udiRelevanceEntity.setDistributeLevelCount(udiRelevanceSaveRequest.getDistributeLevelCount());

src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java

@@ -41,8 +41,8 @@ public class IoCollectOrderBackupController extends BaseController {
     private BasicCollectUserService basicCollectUserService;
 
 
-    @PostMapping("/udiwms/basic/collect/orderFinish/filter")
+    @GetMapping("/udiwms/basic/collect/orderFinish/filter")
-    public BaseResponse filterOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
+    public BaseResponse filterOrder(CollectOrderRequest collectOrderRequest) {
 
         List<Long> workPlaceCodes = null;
         List<UserWorkResponse> page;
@@ -97,7 +97,7 @@ public class IoCollectOrderBackupController extends BaseController {
     public BaseResponse orderUpload(@RequestBody CollectOrderRequest collectOrderRequest) {
         if (StrUtil.isEmpty(collectOrderRequest.getBillNo()))
             return ResultVOUtils.error(500, "单据号不能为空");
-        Boolean aBoolean = ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo());
+        Boolean aBoolean = ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo(),getUser());
         if (!aBoolean) {
             return ResultVOUtils.error("上传失败");
         }

src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java

@@ -409,7 +409,7 @@ public class IoCollectOrderController extends BaseController {
             }
         }
         collectOrderRequest.setUpdateUser(getUserId());
-        collectOrderService.finishOrder(collectOrderRequest);
+        collectOrderService.finishOrder(collectOrderRequest,getUser());
         return ResultVOUtils.success();
     }
 

src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java

@@ -332,7 +332,7 @@ public class BasicProductsEntity {
      * 最後更新時間
      */
     @TableField(value = "updateTime")
-    private String updateTime;
+    private Date updateTime;
 
     /**
      * 创建人
@@ -502,16 +502,50 @@ public class BasicProductsEntity {
     @TableField(value = "pinyinInitial")
     private String pinyinInitial;
 
-
     @TableField(value = "majorStatus")
     private String majorStatus;
+    @TableField(value = "zdcfsycs")
+    private Integer zdcfsycs;
+
+    @TableField(value = "sfwblztlcp")
+    private String sfwblztlcp;
+    @TableField(value = "cgzmraqxgxx")
+    private String cgzmraqxgxx;
+    @TableField(value = "sfbjwycxsy")
+    private String sfbjwycxsy;
+    @TableField(value = "sfwwjbz")
+    private String sfwwjbz;
+    @TableField(value = "syqsfxyjxmj")
+    private String syqsfxyjxmj;
+    @TableField(value = "mjfs")
+    private String mjfs;
+    @TableField(value = "categoryName")
+    private String categoryName;
+    @TableField(value = "destinyType")
+    private Integer destinyType;
+
+    /**
+     * 当前层级包含流通层级使用数量
+     */
+    @TableField(value = "bhltcjsl")
+    private Integer bhltcjsl;
+
+    /**
+     * 当前层级包含使用层级数量
+     */
+    @TableField(value = "bhsycjsl")
+    private Integer bhsycjsl;
 
 
     //工位预警数量
     @TableField(value = "workPlaceCount")
     private Integer workPlaceCount;
 
-
+    /**
+     * 下级单位
+     */
+    @TableField(value = "xjdw")
+    private String xjdw;
 
 
     public static final String COL_ID = "id";

src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java

@@ -169,6 +169,10 @@ public class UdiRelevanceSaveRequest {
     private Integer useLeverCount;
     private Integer useLevel;
     private Integer distributeLevel;
+    /**
+     * 拆包后可用时长(小时)
+     */
+    private Integer unpackUseTime;
     //工位预警数
     private Integer workPlaceCount;
     /**

src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java

@@ -7,13 +7,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
+import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.dao.collect.IoCollectOrderBackupMapper;
 import com.glxp.api.dao.inout.IoCodeTempDao;
+import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
+import com.glxp.api.entity.basic.EntrustReceEntity;
 import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity;
 import com.glxp.api.entity.collect.*;
 import com.glxp.api.entity.inout.IoCodeTempEntity;
@@ -24,19 +28,18 @@ import com.glxp.api.http.sync.SpGetHttpClient;
 import com.glxp.api.req.collect.CollectOrderBizRequest;
 import com.glxp.api.req.collect.CollectOrderRequest;
 import com.glxp.api.req.collect.PostCollectOrderRequest;
+import com.glxp.api.req.inout.ReviewFinishRequest;
 import com.glxp.api.res.basic.BasicSkPrescribeResponse;
 import com.glxp.api.res.collect.CollectOrderBizResponse;
 import com.glxp.api.res.collect.IoCollectOrderResponse;
+import com.glxp.api.service.auth.impl.AuthAdminServiceImpl;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.basic.SysWorkplaceDocumentService;
 import com.glxp.api.service.basic.UdiRlSupService;
 import com.glxp.api.service.inout.IoAddInoutService;
 import com.glxp.api.service.inout.IoCheckInoutService;
 import com.glxp.api.service.inout.IoOrderService;
-import com.glxp.api.util.CustomUtil;
+import com.glxp.api.util.*;
-import com.glxp.api.util.GennerOrderUtils;
-import com.glxp.api.util.IntUtil;
-import com.glxp.api.util.OrderNoTypeBean;
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -85,7 +88,12 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
     private ErpBasicClient erpBasicClient;
 
     @Resource
-    private SpGetHttpClient spGetHttpClient;
+    SpGetHttpClient spGetHttp;
+
+    @Resource
+    private RedisUtil redisUtil;
+
+
 
 
     public List<IoCollectOrderResponse> filterList(CollectOrderRequest collectOrderRequest) {
@@ -146,7 +154,7 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
 
 
     @Transactional(rollbackFor = Exception.class)
-    public void generateOrder(String billNo) {
+    public void generateOrder(String billNo,AuthAdmin authAdmin) {
 
         IoCollectOrderBackup collectOrder = getByBillNo(billNo);
         SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());
@@ -191,14 +199,24 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
             }
         } else if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 1 && sysWorkplaceDocumentEntity.getScanType() != 1) {
             //更新单据为已完成
+//            IoOrderEntity orderEntity = orderService.findByBillNo(collectOrder.getBillNo());
+////            orderEntity.setStatus(7);
+////            orderEntity.setFromType(2);
+////            orderEntity.setDealStatus(3);
+////            orderEntity.setAuditTime(new Date());
+////            orderService.update(orderEntity);
+////            //推送自助平台
+////            spGetHttpClient.updateCheckStatus(orderEntity, collectOrder.getCreateUser());
+
             IoOrderEntity orderEntity = orderService.findByBillNo(collectOrder.getBillNo());
-            orderEntity.setStatus(7);
+            if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
-            orderEntity.setFromType(2);
+                if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP) {
-            orderEntity.setDealStatus(3);
+                    ReviewFinishRequest reviewFinishRequest = new ReviewFinishRequest();
-            orderEntity.setAuditTime(new Date());
+                    reviewFinishRequest.setOrderId(collectOrder.getBillNo());
-            orderService.update(orderEntity);
+                    spGetHttp.reviewOrder(reviewFinishRequest, authAdmin + "");
-            //推送自助平台
+                }
-            spGetHttpClient.updateCheckStatus(orderEntity, collectOrder.getCreateUser());
+                updateReview(authAdmin,orderEntity);
+            }
         } else if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 0) {
             //todo  根据单据类型上传医保或者第三方系统
             PostCollectOrderRequest orderRequest = new PostCollectOrderRequest();
@@ -265,11 +283,11 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
 
 
     @Transactional(rollbackFor = Exception.class)
-    public Boolean orderUpload(String billNo) {
+    public Boolean orderUpload(String billNo,AuthAdmin authAdmin) {
         IoCollectOrderBackup updateOrder = new IoCollectOrderBackup();
         updateOrder.setBillNo(billNo);
         try {
-            this.generateOrder(billNo);
+            this.generateOrder(billNo,authAdmin);
             updateOrder.setUploadStatus(2);
         } catch (Exception e) {
             updateOrder.setUploadStatus(3);
@@ -304,4 +322,17 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
         }
         return reList;
     }
+
+    public BaseResponse updateReview(AuthAdmin authAdmin, IoOrderEntity orderEntity) {
+        orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED);
+        orderEntity.setReviewUser((authAdmin.getId() + ""));
+        orderEntity.setUpdateTime(new Date());
+        orderEntity.setAuditTime(new Date());
+        orderService.update(orderEntity);
+        redisUtil.del(ConstantStatus.REDIS_BILLNO + orderEntity.getBillNo());
+        redisUtil.del(ConstantStatus.REDIS_BILLNO_CODES + orderEntity.getBillNo());
+        //验收完成->进入流程
+        ioCheckInoutService.checkSecond(orderEntity);
+        return ResultVOUtils.success("更新成功");
+    }
 }

src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java

@@ -22,6 +22,7 @@ import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.constant.ConstantType;
 import com.glxp.api.dao.collect.IoCollectOrderMapper;
 import com.glxp.api.dao.inout.IoCodeTempDao;
+import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.auth.DeptEntity;
 import com.glxp.api.entity.auth.SysWorkplace;
 import com.glxp.api.entity.basic.*;
@@ -143,6 +144,12 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
     @Resource
     IoCollectSetService collectSetService;
 
+    @Resource
+    SpGetHttpClient spGetHttpClient;
+
+
+
+
 
 
     public IoCollectOrder getByBillNo(String billNo) {
@@ -766,7 +773,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
 
     SysWorkplacePutRelService sysWorkplacePutRelService;
 
-    public void finishOrder(CollectOrderRequest collectOrderRequest) {
+    public void finishOrder(CollectOrderRequest collectOrderRequest, AuthAdmin authAdmin) {
         IoCollectOrder collectOrder = new IoCollectOrder();
         BeanUtils.copyProperties(collectOrderRequest, collectOrder);
         collectOrder.setTagStatus(3);
@@ -794,7 +801,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
             collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo());
             //更新数据至第三方系统
             //单据更新
-            ioCollectOrderBackupService.generateOrder(collectOrder.getBillNo());
+            ioCollectOrderBackupService.generateOrder(collectOrder.getBillNo(),authAdmin);
 //            spGetHttpClient.updateCheckStatus(orderEntity,collectOrder.getCreateUser());
         });
     }

src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java

@@ -98,8 +98,8 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
 
 
     public IoSplitFifoCodeEntity findByCode(String code, Long workPlaceCode) {
-        if (workPlaceCode == null)
+//        if (workPlaceCode == null)
-            return null;
+//            return null;
         return splitFifoCodeMapper.selectOne(
                 new LambdaQueryWrapper<IoSplitFifoCodeEntity>()
                         .eq(IoSplitFifoCodeEntity::getCode, code)

src/main/java/com/glxp/api/task/AsyncIoCollectOrderUploadTask.java

@@ -81,7 +81,7 @@ public class AsyncIoCollectOrderUploadTask implements SchedulingConfigurer {
                 List<IoCollectOrderResponse> orderResponses = ioCollectOrderBackupService.filterList(collectOrderRequest);
                 if (CollUtil.isNotEmpty(orderResponses)){
                     orderResponses.forEach( item -> {
-                        ioCollectOrderBackupService.orderUpload(item.getBillNo());
+                        ioCollectOrderBackupService.orderUpload(item.getBillNo(),null);
                     });
                 }
 

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -1540,6 +1540,9 @@
             <if test="distributeLevel != null">
                 distributeLevel=#{distributeLevel},
             </if>
+            <if test="unpackUseTime != null">
+                unpackUseTime=#{unpackUseTime},
+            </if>
         </trim>
         WHERE id = #{id}
     </update>

src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml

@@ -24,7 +24,7 @@
                ico.fromCorpName,
                ico.tagMsg,
                sys_workplace_document.busName                       busTypeName,
-               thr_bustype_origin.name                      actionName,
+               COALESCE(thr_bustype_origin.name, basic_bussiness_type.name) as actionName,
                sw.workplaceName,
                ico.id,
                ico.orderTime,
@@ -40,6 +40,7 @@
         FROM io_collect_order_origin ico
                  left join sys_workplace_document on ico.busType = sys_workplace_document.documentTypeCode
                  left join thr_bustype_origin on sys_workplace_document.documentTypeCode = thr_bustype_origin.action
+                 left join basic_bussiness_type on sys_workplace_document.documentTypeCode = basic_bussiness_type.action
                  left join basic_corp bc on ico.fromCorp = bc.erpId
                  left join sys_workplace sw on ico.workPlaceCode = sw.workplaceId