选入阿里单据,重复扫码

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

@@ -265,7 +265,7 @@ public class BasicBussinessTypeController extends BaseController {
     @GetMapping("/udiwms/localBusType/filterJoinByUserOptimize")
     public BaseResponse filterJoinByUserOptimize(FilterBussinessTypeRequest bussinessTypeFilterRequest,
                                                  BindingResult bindingResult) {
-        List<DictDto> reList  = new ArrayList<>();
+        List<DictDto> reList = new ArrayList<>();
         if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getVueType())) {
             List<BasicBussinessTypeEntity> result = new ArrayList<>();
             List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.findByVueTypeAndType(bussinessTypeFilterRequest);
@@ -291,8 +291,8 @@ public class BasicBussinessTypeController extends BaseController {
                 result.addAll(bussinessTypeEntities);
             }
 
-            reList = result.stream().map(s-> {
-                DictDto dictDto = new DictDto(s.getAction(),s.getName());
+            reList = result.stream().map(s -> {
+                DictDto dictDto = new DictDto(s.getAction(), s.getName());
                 return dictDto;
             }).collect(Collectors.toList());
         } else {
@@ -303,8 +303,8 @@ public class BasicBussinessTypeController extends BaseController {
             bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser(
                     bussinessTypeFilterRequest);
 
-            reList = bussinessTypeEntities.stream().map(s-> {
-                DictDto dictDto = new DictDto(s.getAction(),s.getName());
+            reList = bussinessTypeEntities.stream().map(s -> {
+                DictDto dictDto = new DictDto(s.getAction(), s.getName());
                 return dictDto;
             }).collect(Collectors.toList());
 

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

@@ -723,8 +723,8 @@ public class IoOrderDetailBizController extends BaseController {
         if (CollUtil.isEmpty(aliYljgBillDetailDrugList)) {
             return ResultVOUtils.error("单据明细为空！");
         }
-        List<AliYljgBillDetailDrugCode> aliYljgBillDetailDrugCodeList = aliYljgBillDetailDrugList.get(0).getAliYljgBillDetailDrugCodeList();
-        if (CollUtil.isEmpty(aliYljgBillDetailDrugCodeList)) {
+        List<AliYljgBillDetailDrugCode> tempDrug = aliYljgBillDetailDrugList.get(0).getAliYljgBillDetailDrugCodeList();
+        if (CollUtil.isEmpty(tempDrug)) {
             return ResultVOUtils.error("单据码明细为空！");
         }
 
@@ -789,7 +789,7 @@ public class IoOrderDetailBizController extends BaseController {
             BeanUtils.copyProperties(ioOrderEntity, addOrderRequest);
 
             for (int j = 0; j < aliYljgBillDetailDrugCodeList1.size(); j++) {
-                AliYljgBillDetailDrugCode aliYljgBillDetailDrugCode = aliYljgBillDetailDrugCodeList.get(j);
+                AliYljgBillDetailDrugCode aliYljgBillDetailDrugCode = aliYljgBillDetailDrugCodeList1.get(j);
                 addOrderRequest.setCode(aliYljgBillDetailDrugCode.getCode());
 
                 IoCodeLostEntity codeLostEntity = ioCodeLostService.findByCode(aliYljgBillDetailDrugCode.getCode());

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

@@ -328,4 +328,6 @@ public class BussinessTypeSaveRequest {
     @TableField(value = "productType")
     private Integer productType;
 
+    private Integer checkWebNewType;
+
 }