12/20 bug修改 现场管理

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -1610,8 +1610,8 @@ public class IoCodeTempController extends BaseController {
 //           if (StrUtil.isEmpty(codeEnttity.getBatchNo())) {
                 //当关联关系存在的时候 以关联关系的批次号为准
                 codeEnttity.setBatchNo(codeRelEntity.getBatchNo());
-                codeEnttity.setExpireDate(codeRelEntity.getMadeDate() + "");
+                codeEnttity.setProduceDate( MsDateUtil.formatDate(codeRelEntity.getMadeDate(), "yyMMdd"));
-                codeEnttity.setExpireDate(codeRelEntity.getValidateDate() + "");
+                codeEnttity.setExpireDate( MsDateUtil.formatDate(codeRelEntity.getValidateDate(), "yyMMdd"));
 //                }
             }
 

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

@@ -547,8 +547,8 @@ public class BasicProductsEntity {
     /**
      * 明细分类
      */
-    @TableField(value = "detailSort")
+//    @TableField(value = "detailSort")
-    private Integer detailSort;
+//    private Integer detailSort;
 
     public static final String COL_ID = "id";
 

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

@@ -311,4 +311,7 @@ public class UdiRelevanceEntity {
     @TableField(value = "unpackUseTime")
     private Integer unpackUseTime;
 
+    @TableField(value = "detailSort")
+    private Integer detailSort;
+
 }

src/main/java/com/glxp/api/entity/collect/IoCollectCodeBackup.java

@@ -146,6 +146,27 @@ public class IoCollectCodeBackup implements Serializable {
     @ApiModelProperty(value = "码校验状态 0 or null:未校验 1:已校验 3:已替换")
     private Integer scanCodeCheckStatus;
 
+    /**
+     *  采购类型 1：普通入账产品；2.预验收产品。3：寄售产品
+     */
+    @TableField(value = "purType")
+    @ApiModelProperty(value = "1：普通入账产品；2.预验收产品。3：寄售产品")
+    private Integer purType;
+
+    /**
+     *  是否消耗 0:未消耗 1:已消耗
+     */
+    @TableField(value = "isUsed")
+    @ApiModelProperty(value = "是否消耗 0:未消耗 1:已消耗")
+    private Boolean isUsed;
+
+    /**
+     *  时间戳
+     */
+    @TableField(value = "inBatchNo")
+    @ApiModelProperty(value = "时间戳")
+    private Long inBatchNo;
+
 
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/collect/IoCollectSet.java

@@ -78,5 +78,13 @@ public class IoCollectSet implements Serializable {
     @TableField(value = "lastCodeSplit")
     @ApiModelProperty(value = "自动上传已完成单据轮询时间")
     private Integer startUploadHour;
+
+    /**
+     * 是否启用寄售预验收扫码校验   0:关闭 1:开启
+     */
+    @TableField(value = "isScanCodeCheck")
+    @ApiModelProperty(value = "是否启用寄售预验收扫码校验 ")
+    private Boolean isScanCodeCheck;
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -35,6 +35,7 @@ public class UpdateLevelDrugRequest {
     private String uuid;
     private String xjdw;
     private Integer diType;
+    private String packRatio;
 
     public Integer getMyBhxjsl() {
         if (bhxjsl == null || bhxjsl == 0)

src/main/java/com/glxp/api/service/basic/UdiContrastService.java

@@ -443,6 +443,7 @@ public class UdiContrastService {
                     //商品条码 essentialDrugMarkName sptm
 //                    udiProductEntity.setSptm(ybDrug.getBusinessLicense());
                     udiProductEntity.setPrepnUnit(thirdAliDrug.getPrepnUnitName());
+                    udiProductEntity.setPackRatio(thirdAliDrug.getPackRatio());
 
                     List<Integer> integers = new ArrayList<>();
                     if (StrUtil.isNotEmpty(thirdAliDrug.getPackRatio())) {

src/main/java/com/glxp/api/service/basic/UdiProductService.java

@@ -356,8 +356,10 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
             udiRelevanceEntity.setPayFeeCode(addProductRequest.getPayFeeCode());
             udiRelevanceEntity.setUseMaxLevel(addProductRequest.getUseMaxLevel());
             udiRelevanceEntity.setDistributeMaxLevel(addProductRequest.getDistributeMaxLevel());
+            udiRelevanceEntity.setDetailSort(addProductRequest.getDetailSort());
             udiRelevanceEntity.setUpdateTime(new Date());
             udiRelevanceEntity.setUnpackUseTime(addProductRequest.getUnpackUseTime());
+            udiRelevanceEntity.setDetailSort(addProductRequest.getDetailSort());
             udiRelevanceDao.updateById(udiRelevanceEntity);
             updateLevelCount(udiRelevanceEntity);
         } else {
@@ -375,6 +377,7 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
             udiRelevanceEntity.setHcType(addProductRequest.getHcType());
             udiRelevanceEntity.setPayFeeCode(addProductRequest.getPayFeeCode());
             udiRelevanceEntity.setUnpackUseTime(addProductRequest.getUnpackUseTime());
+            udiRelevanceEntity.setDetailSort(addProductRequest.getDetailSort());
             udiRelevanceEntity.setUpdateTime(new Date());
 
 //            if (addProductRequest.getDistributeLevelDi() != null) {

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

@@ -8,8 +8,10 @@ import com.glxp.api.dao.collect.IoCollectCodeBackMapper;
 import com.glxp.api.entity.collect.*;
 import com.glxp.api.req.collect.CollectOrderBizRequest;
 import com.glxp.api.req.collect.IoCollectCodeRequest;
+import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.res.collect.CollectOrderBizResponse;
 import com.glxp.api.res.collect.IoCollectCodeResponse;
+import com.glxp.api.service.basic.UdiRelevanceService;
 import com.glxp.api.util.IntUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -93,17 +95,23 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
             }
         }
 
-//        if(QXCF001)
+        //有问题
+//        depleteScanCode(collectOrder.getBillNo());
     }
 
     @Resource
     IoCollectCodeBackService collectCodeBackService;
 
+    @Resource
+    UdiRelevanceService udiRelevanceService;
+
     public void saveManuCode(List<IoCollectOrderCodeMan> manList, IoCollectOrder collectOrder) {
         if (CollUtil.isEmpty(manList))
             return;
         List<IoCollectCodeBackup> ioCollectCodes = new ArrayList<>();
         for (IoCollectOrderCodeMan ioCollectOrderCodeMan : manList) {
+            //查询采购类型
+            UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(ioCollectOrderCodeMan.getRelId() + "");
             ioCollectCodes.add(IoCollectCodeBackup.builder().code(ioCollectOrderCodeMan.getUdiCode())
                     .fromType(collectOrder.getFromType())
                     .busType(collectOrder.getBusType())
@@ -114,7 +122,9 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
                     .fifoSplit(3)
                     .workPlaceCode(collectOrder.getWorkPlaceCode())
                     .relId(ioCollectOrderCodeMan.getRelId())
-                    .remark(collectOrder.getRemark()).build());
+                    .remark(collectOrder.getRemark())
+                    .purType(udiRelevanceResponse.getPurType())
+                    .inBatchNo(System.currentTimeMillis()).build());
         }
         collectCodeBackService.saveBatch(ioCollectCodes);
     }
@@ -124,6 +134,7 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
             return;
         List<IoCollectCodeBackup> ioCollectCodes = new ArrayList<>();
         for (IoCollectOrderCodeAuto collectOrderCodeAuto : codeAutoList) {
+            UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(collectOrderCodeAuto.getRelId() + "");
             ioCollectCodes.add(IoCollectCodeBackup.builder().code(collectOrderCodeAuto.getUdiCode())
                     .fromType(collectOrder.getFromType())
                     .busType(collectOrder.getBusType())
@@ -134,7 +145,9 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
                     .fifoSplit(1)
                     .relId(collectOrderCodeAuto.getRelId())
                     .workPlaceCode(collectOrder.getWorkPlaceCode())
-                    .remark(collectOrder.getRemark()).build());
+                    .remark(collectOrder.getRemark())
+                    .purType(udiRelevanceResponse.getPurType())
+                    .inBatchNo(System.currentTimeMillis()).build());
         }
         collectCodeBackService.saveBatch(ioCollectCodes);
     }
@@ -144,6 +157,7 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
             return;
         List<IoCollectCodeBackup> ioCollectCodes = new ArrayList<>();
         for (IoCollectOrderCodeAuto collectOrderCodeAuto : codeAutoList) {
+            UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(collectOrderCodeAuto.getRelId() + "");
             ioCollectCodes.add(IoCollectCodeBackup.builder().code(collectOrderCodeAuto.getUdiCode())
                     .fromType(collectOrder.getFromType())
                     .busType(collectOrder.getBusType())
@@ -154,10 +168,23 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
                     .fifoSplit(2)
                     .relId(collectOrderCodeAuto.getRelId())
                     .workPlaceCode(collectOrder.getWorkPlaceCode())
-                    .remark(collectOrder.getRemark()).build());
+                    .remark(collectOrder.getRemark())
+                    .purType(udiRelevanceResponse.getPurType())
+                    .inBatchNo(System.currentTimeMillis()).build());
         }
         collectCodeBackService.saveBatch(ioCollectCodes);
     }
 
+    public void depleteScanCode(String billNo){
+        List<IoCollectCodeBackup> ioCollectCodeBackups = collectCodeBackService.listByBillNo(billNo);
+        ArrayList<IoCollectCodeBackup> ioCollectCodeBackups1 = new ArrayList<>();
+        for (IoCollectCodeBackup collectCodeBackup : ioCollectCodeBackups) {
+            if (collectCodeBackup.getBusType().equals("QXCF001") && collectCodeBackup.getPurType() != 1){
+                collectCodeBackup.setIsUsed(true);
+                ioCollectCodeBackups1.add(collectCodeBackup);
+            }
+        }
+        collectCodeBackService.updateBatchById(ioCollectCodeBackups1);
+    }
 
 }

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

@@ -455,7 +455,6 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
         for (CollectOrderBizResponse collectOrderBiz : list) {
             CollectOrderBizResponse collectOrderBizResponse = new CollectOrderBizResponse();
             BeanUtils.copyProperties(collectOrderBiz, collectOrderBizResponse);
-
             //查询手动赋码的code
             for (IoCollectCodeBackup ioCollectCodeBackup : ioCollectCodeBackups) {
                 UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(collectOrderBizResponse.getNameCode());

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

@@ -93,6 +93,9 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
     @Resource
     IoSplitCodeService splitCodeService;
 
+    @Resource
+    IoCollectCodeBackService ioCollectCodeBackService;
+
     public List<CollectOrderCodeManResponse> filterList(CollectOrderCodeManRequest collectOrderCodeManRequest) {
         if (collectOrderCodeManRequest == null) {
             return Collections.emptyList();
@@ -124,12 +127,16 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
     @Resource
     IoCodeLostService codeLostService;
 
+    @Resource
+    IoCollectSetService collectSetService;
+
     @Transactional(rollbackFor = Exception.class)
     public IoCollectOrder prescribeTagCode(AddTagCodeReqeust addTagCodeReqeust) {
         Long userId = customerService.getUserId();
         String userIds = customerService.getUserId() + "";
         SysWorkplace workPlace = sysWorkPlaceService.getWorkplace(addTagCodeReqeust.getWorkPlaceCode());
         SysWorkplacePutRel sysWorkplacePutRel = workplacePutRelService.findPutWorkPlace(workPlace.getWorkplaceId(), null);
+        IoCollectSet collectSet = collectSetService.getSet();
         Long putWorkPlaceCode = null;
         if (sysWorkplacePutRel != null)
             putWorkPlaceCode = sysWorkplacePutRel.getWorkPlaceCode();
@@ -174,6 +181,21 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
         }
 
 //        todo 校验是否存在码表
+        //单据设置 是否开启 寄售预验收扫码校验
+        // 产品采购类型
+        // 拿到产品采购类型
+        // code  purType  查找 io_collect_code_backup 是否存在 不存在 提示 当前码未进入预验收/寄售库
+        if (collectSet.getIsScanCodeCheck()){
+            if (udiRelevanceResponse.getPurType() != 1){
+                IoCollectCodeBackup collectCodeBackup = ioCollectCodeBackService.getOne(new LambdaQueryWrapper<IoCollectCodeBackup>()
+                        .eq(IoCollectCodeBackup::getCode, code)
+                        .eq(IoCollectCodeBackup::getPurType,udiRelevanceResponse.getPurType()));
+                if (collectCodeBackup == null){
+                    String PurTypeName = udiRelevanceResponse.getPurType() == 2 ? "预验收" : "寄售";
+                    throw new JsonException(500, "当前产品追溯码未进入" + PurTypeName + "库");
+                }
+            }
+        }
 
         //流通数量
         Integer circleCount = calCountUtil.getCirActCount(udiRelevanceResponse);
@@ -387,8 +409,10 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                         collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity, collectOrder);
                         collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
                     } else {
-                        collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
+//                        collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
-                        collectOrderBiz.setScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount);
+//                        collectOrderBiz.setScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount);
+                        collectOrderBiz.setAddScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
+                        collectOrderBiz.setAddScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount);
                     }
                     break;
                 case 2: //不插入
@@ -406,9 +430,10 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                         }
                         throw new JsonException(500, collectOrderBiz.getCpmctymc() + "扫码数量超出！");
                     }
-                    collectOrderBiz.setScanCount(count);
+//                    collectOrderBiz.setScanCount(count);
-                    collectOrderBiz.setScanActCount(actCount);
+//                    collectOrderBiz.setScanActCount(actCount);
-
+                    collectOrderBiz.setAddScanCount(count);
+                    collectOrderBiz.setAddScanActCount(actCount);
                     break;
                 case 3: //提醒是否插入
 
@@ -436,21 +461,26 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                             }
 
                         }
-                        collectOrderBiz.setScanCount(count1);
+//                        collectOrderBiz.setScanCount(count1);
-                        collectOrderBiz.setScanActCount(actCount1);
+//                        collectOrderBiz.setScanActCount(actCount1);
+                        collectOrderBiz.setAddScanCount(count1);
+                        collectOrderBiz.setAddScanActCount(actCount1);
                     } else {
                         if (collectOrderBiz == null) {
                             collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity, collectOrder);
                             collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
                         } else {
-                            collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
+//                            collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
-                            collectOrderBiz.setScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount);
+//                            collectOrderBiz.setScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount);
+                            collectOrderBiz.setAddScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
+                            collectOrderBiz.setAddScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount);
                         }
                     }
                     break;
                 default:
                     break;
             }
+//            collectOrderBiz.setAddScanCount(1);
             collectOrderBizService.insertOrUpdate(collectOrderBiz);
         }
 
@@ -567,6 +597,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                     collectOrderBiz.setAddScanCount(1);
                     collectOrderBiz.setAddActCount(actCount);
                     collectOrderBiz.setAddScanActCount(actCount);
+                    collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
 
                     return collectOrderBiz;
                 }

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

@@ -886,7 +886,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                     Boolean autoUploadOrder = ioCollectSet.getAutoUploadOrder();
 
                     if (autoUploadOrder) {
-                        ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo(), null);
+                        ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo(), authAdmin);
                     }
                 }
         );

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

@@ -471,11 +471,12 @@ public class IoAddInoutService {
             orderDetailCodeService.insert(buildEntity(orderEntity, codeTempEntity, udiRelevanceResponse));
             ioOrderDetailCodeEntities = orderDetailCodeDao.selectList(new QueryWrapper<IoOrderDetailCodeEntity>().select("id", "count", "reCount", "bindRlFk", "batchNo", "price").eq("orderIdFk", orderEntity.getBillNo()));
         } else {
+//            && BigDecimalUtil.equalTo(IntUtil.value(orderDetailCodeEntity.getPrice()), IntUtil.value(codeTempEntity.getPrice())
             boolean isUpdate = false;
             for (IoOrderDetailCodeEntity orderDetailCodeEntity : ioOrderDetailCodeEntities) {
                 if (orderDetailCodeEntity.getBindRlFk().longValue() == udiRelevanceResponse.getId().longValue()
-                        && StrUtil.trimToEmpty(orderDetailCodeEntity.getBatchNo()).equals(StrUtil.trimToEmpty(codeTempEntity.getBatchNo()))
+                        && StrUtil.trimToEmpty(orderDetailCodeEntity.getBatchNo()).equals(StrUtil.trimToEmpty(codeTempEntity.getBatchNo())
-                        && BigDecimalUtil.equalTo(IntUtil.value(orderDetailCodeEntity.getPrice()), IntUtil.value(codeTempEntity.getPrice()))
+                        )
                 ) {
                     orderDetailCodeEntity.setCount(orderDetailCodeEntity.getCount() + codeTempEntity.getMyCount());
                     orderDetailCodeEntity.setReCount(orderDetailCodeEntity.getReCount() + codeTempEntity.getMyReCount());

src/main/java/com/glxp/api/service/sync/HeartService.java

@@ -1868,21 +1868,20 @@ public class HeartService {
             basicHospTypeDao.replaceBatch(hospTypeList);
         }
         if (CollectionUtil.isNotEmpty(udiRelevanceList)) {
-            List<List<UdiRelevanceEntity>> splits = CustomUtil.splitList(udiRelevanceList, 500);
+            List<List<UdiRelevanceEntity>> splits = CustomUtil.splitList(udiRelevanceList, 200);
             splits.forEach(items -> {
                 udiRelevanceDao.replaceBatch(items);
             });
         }
         if (CollectionUtil.isNotEmpty(productsList)) {
 
-            List<List<BasicProductsEntity>> splits = CustomUtil.splitList(productsList, 500);
+            List<List<BasicProductsEntity>> splits = CustomUtil.splitList(productsList, 200);
             splits.forEach(items -> {
                 basicProductsDao.replaceBatch(items);
             });
 //            basicProductsDao.replaceBatchs(productsList, 1000);
         }
         if (CollectionUtil.isNotEmpty(relevanceList)) {
-            relevanceDao.replaceBatch(relevanceList);
         }
         if (CollectionUtil.isNotEmpty(corpList)) {
             corpDao.replaceBatch(corpList);

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

@@ -77,9 +77,9 @@ public class AsyncIoCollectOrderFinishTask implements SchedulingConfigurer {
                 SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByBusType(collectOrder.getBusType());
                 if (sysWorkplaceDocumentEntity != null && IntUtil.value(sysWorkplaceDocumentEntity.getAutoTag()) == 1 && IntUtil.value(collectOrder.getTagStatus()) == 1) {
                     CollectOrderRequest collectOrderRequest = new CollectOrderRequest();
-                    BeanUtils.copyProperties(collectOrderRequest, collectOrder);
+                    BeanUtils.copyProperties(collectOrder, collectOrderRequest);
                     //获取当前业务类型对应的采集工位
-                    SysWorkplaceBus sysWorkplaceBus = sysWorkplaceBusService.getOne(new LambdaQueryWrapper<SysWorkplaceBus>().eq(SysWorkplaceBus::getBusTypeCode, sysWorkplaceDocumentEntity.getWorkplaceCode()).last("limit 1"));
+                    SysWorkplaceBus sysWorkplaceBus = sysWorkplaceBusService.getOne(new LambdaQueryWrapper<SysWorkplaceBus>().eq(SysWorkplaceBus::getBusTypeCode, sysWorkplaceDocumentEntity.getDocumentTypeCode()).last("limit 1"));
                     if (sysWorkplaceBus == null)
                         break;
                     collectOrderRequest.setWorkPlaceCode(sysWorkplaceBus.getWorkplaceCode());

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

@@ -5,6 +5,7 @@ import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.StrUtil;
 import com.glxp.api.dao.basic.SysWorkplaceDocumentDao;
 import com.glxp.api.dao.schedule.ScheduledDao;
+import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.collect.IoCollectSet;
 import com.glxp.api.entity.system.ScheduledEntity;
 import com.glxp.api.req.basic.WorkBindBusTypeRequest;
@@ -100,7 +101,8 @@ public class AsyncIoCollectOrderUploadTask implements SchedulingConfigurer {
                 List<IoCollectOrderResponse> orderResponses = ioCollectOrderBackupService.filterList(collectOrderRequest);
                 if (CollUtil.isNotEmpty(orderResponses)){
                     orderResponses.forEach( item -> {
-                        ioCollectOrderBackupService.orderUpload(item.getBillNo(),null);
+                        AuthAdmin authAdmin = new AuthAdmin();
+                        ioCollectOrderBackupService.orderUpload(item.getBillNo(),authAdmin);
                     });
                 }
                 // 无限循环去上传单据不做限制了

src/main/java/com/glxp/api/util/DimaUtil.java

@@ -28,14 +28,14 @@ public class DimaUtil {
         }
 
         // 最后加上最小单位（第一层级为 1）
-        calculatedLevels.add(1);
+        calculatedLevels.add(0,1);
 
         // 结果倒序
-        List<Integer> reversed = new ArrayList<>();
+//        List<Integer> reversed = new ArrayList<>();
-        for (int i = calculatedLevels.size() - 1; i >= 0; i--) {
+//        for (int i = calculatedLevels.size() - 1; i >= 0; i--) {
-            reversed.add(calculatedLevels.get(i));
+//            reversed.add(calculatedLevels.get(i));
-        }
+//        }
-        return reversed;
+        return calculatedLevels;
     }
 
 

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

@@ -196,7 +196,7 @@
          destinyType,
          productsType, prepnUnit, prepnSpec, storageCondition, transportCondition, indate, packMatrial, majorType,
          majorStatus, physicType, medicareType, bzgg, xjdw,
-         requireScanCode, detailSort)
+         requireScanCode)
         values (#{id}, #{uuid},
                 #{originUuid},
                 #{nameCode},
@@ -270,7 +270,7 @@
                 #{physicType},
                 #{medicareType},
                 #{bzgg}, #{xjdw},
-                #{requireScanCode}, #{detailSort})
+                #{requireScanCode})
     </insert>
 
     <insert id="insertUdiInfos" parameterType="java.util.List">
@@ -283,7 +283,7 @@
          allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2,
          basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
          basicPrductRemak8, updateTime, sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj,
-         mjfs, categoryName, pinyinInitial, detailSort)
+         mjfs, categoryName, pinyinInitial)
         values
 
         <foreach collection="udiInfoEntities" item="item" index="index"
@@ -342,7 +342,7 @@
              #{item.basicPrductRemak8}, #{item.updateTime}, #{item.sfwblztlcp}, #{item.cgzmraqxgxx}, #{item.sfbjwycxsy},
              #{item.zdcfsycs},
              #{item.sfwwjbz}, #{item.syqsfxyjxmj}, #{item.mjfs},
-             #{item.categoryName}, #{item.pinyinInitial}, #{item.detailSort})
+             #{item.categoryName}, #{item.pinyinInitial})
         </foreach>
     </insert>
 
@@ -587,9 +587,6 @@
             <if test="packMatrial != null">
                 packMatrial=#{packMatrial},
             </if>
-            <if test="detailSort != null">
-                packMatrial=#{packMatrial},
-            </if>
         </trim>
         WHERE nameCode = #{nameCode}
           and uuid = #{uuid}
@@ -801,9 +798,6 @@
             <if test="workPlaceCount != null">
                 workPlaceCount=#{workPlaceCount},
             </if>
-            <if test="detailSort != null">
-                workPlaceCount=#{workPlaceCount},
-            </if>
         </trim>
         where uuid = #{uuid}
     </update>
@@ -1009,9 +1003,6 @@
             <if test="matrial != null">
                 matrial=#{matrial},
             </if>
-            <if test="detailSort != null">
-                workPlaceCount=#{workPlaceCount},
-            </if>
         </trim>
         where id = #{id}
     </update>
@@ -1177,9 +1168,6 @@
             <if test="basicPrductRemak8 != null">
                 basicPrductRemak8=#{basicPrductRemak8},
             </if>
-            <if test="detailSort != null">
-                workPlaceCount=#{workPlaceCount},
-            </if>
             <if test="pinyinInitial != null">
                 pinyinInitial=#{pinyinInitial},
             </if>

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

@@ -594,8 +594,7 @@
         basic_products.majorType,
         basic_products.medicareType,
         basic_products.workPlaceCount,
-        th.hsmc hslbName,
+        th.hsmc hslbName
-        basic_products.detailSort
         FROM basic_products
         inner JOIN basic_udirel
         ON basic_products.uuid = basic_udirel.uuid
@@ -1346,7 +1345,7 @@
                  groupBuy, needCert, isStack,
                  distributeLevelCount, useLevel,
                  distributeLevel,
-                 splitEnable, autoCode, distributeMaxLevel, useMaxLevel, unpackUseTime)
+                 splitEnable, autoCode, distributeMaxLevel, useMaxLevel, unpackUseTime,detailSort)
         values (#{id},
                 #{uuid},
                 #{mainId},
@@ -1382,7 +1381,7 @@
                 #{useLevel},
                 #{distributeLevel},
                 #{splitEnable},
-                #{autoCode}, #{distributeMaxLevel}, #{useMaxLevel}, #{unpackUseTime})
+                #{autoCode}, #{distributeMaxLevel}, #{useMaxLevel}, #{unpackUseTime}, #{detailSort})
     </insert>
 
     <insert id="insertUdiRelevanceignore"

src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml

@@ -525,6 +525,7 @@
                 AND batchNo is null
             </if>
         </where>
+        limit 1
     </select>
 
 

src/main/resources/schemas/schema_v2.4.sql

@@ -4947,3 +4947,21 @@ CALL Pro_Temp_ColumnWork('io_collect_order_backup', 'checkCodeConfirm',
 CALL Pro_Temp_ColumnWork('io_collect_code_backup', 'scanCodeCheckStatus',
                          ' tinyint NULL DEFAULT b''0''COMMENT ''码校验状态 0 or null:未校验 1:已校验 3:已替换''',
                          1);
+
+CALL Pro_Temp_ColumnWork('io_collect_set', 'isScanCodeCheck',
+                         ' tinyint NULL DEFAULT b''0''COMMENT ''是否启用寄售预验收扫码校验  0:关闭 1:开启''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('io_collect_code_backup', 'purType',
+                         ' tinyint NULL DEFAULT b''1''COMMENT ''采购类型 1：普通入账产品；2.预验收产品。3：寄售产品''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('io_collect_code_backup', 'isUsed',
+                         ' tinyint NULL DEFAULT b''0''COMMENT ''是否消耗 0:未消耗 1:已消耗''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('io_collect_code_backup', 'inBatchNo',
+                         ' bigint DEFAULT NULL COMMENT ''时间戳''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('basic_udirel', 'detailSort', ' tinyint DEFAULT NULL', 1);