Merge remote-tracking branch 'origin/dev' into dev

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

@@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.annotation.Log;
+import com.glxp.api.annotation.RepeatSubmit;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
@@ -102,6 +103,7 @@ public class IoCodeTempController extends BaseController {
     InvPreProductDetailService invPreProductDetailService;
 
     //手持端扫码单据上传调用接口
+    @RepeatSubmit()
     @AuthRuleAnnotation("")
     @PostMapping("warehouse/inout/postOrders")
     @Log(title = "单据管理", businessType = BusinessType.INSERT)
@@ -333,6 +335,7 @@ public class IoCodeTempController extends BaseController {
     }
 
     //前端扫码提交
+    @RepeatSubmit()
     @AuthRuleAnnotation("")
     @PostMapping("warehouse/inout/addOrderWeb")
     @Log(title = "单据管理", businessType = BusinessType.INSERT)
@@ -907,7 +910,9 @@ public class IoCodeTempController extends BaseController {
         if (StrUtil.isEmpty(udiEntity.getExpireDate()) && !udiRelevanceResponse.getAllowNoExpire()) {
             errMsg = errMsg + ",失效日期";
         }
-
+        if (StrUtil.isEmpty(udiEntity.getSerialNo()) && !udiRelevanceResponse.getAllowNoSerial()) {
+            errMsg = errMsg + ",序列号";
+        }
         if (StrUtil.isNotEmpty(errMsg)) {
             BaseResponse baseResponse = ResultVOUtils.error(507, "产品三期缺失请补齐" + errMsg.substring(1) + "");
             baseResponse.setData(udiEntity);

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

@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.annotation.Log;
+import com.glxp.api.annotation.RepeatSubmit;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
@@ -193,6 +194,7 @@ public class IoOrderController extends BaseController {
 
 
     //新增业务-立即提交
+    @RepeatSubmit()
     @AuthRuleAnnotation("")
     @PostMapping("warehouse/inout/submitBiz")
     @Log(title = "单据管理", businessType = BusinessType.UPDATE)
@@ -235,6 +237,7 @@ public class IoOrderController extends BaseController {
     }
 
     //新增扫码单据-立即提交
+    @RepeatSubmit()
     @AuthRuleAnnotation("")
     @PostMapping("warehouse/inout/submitCodes")
     @Log(title = "单据管理", businessType = BusinessType.UPDATE)
@@ -265,6 +268,7 @@ public class IoOrderController extends BaseController {
 
 
     //新增业务单据，新增扫码单据，等待校验-草稿保存
+    @RepeatSubmit()
     @AuthRuleAnnotation("")
     @PostMapping("warehouse/inout/saveOrderWeb")
     @Log(title = "单据管理", businessType = BusinessType.UPDATE)
@@ -288,7 +292,7 @@ public class IoOrderController extends BaseController {
                 basicCorpService.insert(basicCorpEntity);
             }
             orderEntity.setFromCorp(basicCorpEntity.getErpId());
-        }else {
+        } else {
             orderEntity.setFromCorp(addOrderRequest.getFromCorp());
         }
         orderEntity.setAction(addOrderRequest.getAction());
@@ -312,6 +316,7 @@ public class IoOrderController extends BaseController {
     }
 
     //等待校验-立即提交
+    @RepeatSubmit()
     @AuthRuleAnnotation("")
     @PostMapping("warehouse/inout/submitOrderWeb")
     @Log(title = "单据管理", businessType = BusinessType.UPDATE)
@@ -373,6 +378,7 @@ public class IoOrderController extends BaseController {
     }
 
     //带配货-立即提交
+    @RepeatSubmit()
     @AuthRuleAnnotation("")
     @PostMapping("warehouse/inout/waitAllocate/submitOrderWeb")
     @Log(title = "单据管理", businessType = BusinessType.UPDATE)
@@ -477,6 +483,7 @@ public class IoOrderController extends BaseController {
     }
 
     //已验收单据撤回
+    @RepeatSubmit()
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/inout/order/received/rollback")
     @Log(title = "单据管理", businessType = BusinessType.UPDATE)
@@ -520,6 +527,7 @@ public class IoOrderController extends BaseController {
 
 
     //已校验单据撤回到等待处理
+    @RepeatSubmit()
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/inout/order/unReceive/rollback")
     @Log(title = "单据管理", businessType = BusinessType.UPDATE)
@@ -681,6 +689,7 @@ public class IoOrderController extends BaseController {
      * @param billNo
      * @return
      */
+    @RepeatSubmit()
     @GetMapping("/udiwms/inout/order/submitToThrSys")
     public BaseResponse submitToThrSys(@RequestParam("billNo") String billNo) {
         if (StrUtil.isBlank(billNo)) {
@@ -725,6 +734,7 @@ public class IoOrderController extends BaseController {
     @Resource
     InvWarehouseService invWarehouseService;
 
+    @RepeatSubmit()
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/stock/order/change")
     public BaseResponse stockOrderChange(@RequestBody AddOrderChangeRequest addOrderChangeRequest) {
@@ -783,7 +793,6 @@ public class IoOrderController extends BaseController {
         }
 
 
-
         originCodes.forEach(
                 code -> {
                     //复制选中的产品

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

@@ -33,6 +33,7 @@ import com.glxp.api.req.inv.FilterInvoiceRequest;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
+import com.glxp.api.res.basic.UdiRlSupResponse;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
 import com.glxp.api.res.inout.IoOrderInvoiceResponse;
@@ -291,9 +292,9 @@ public class IoOrderDetailBizController extends BaseController {
         for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
 
             thrOrderDetailEntity.getProductId();
-            List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.selectListByThirdId(thrOrderDetailEntity.getProductId(), thrOrderEntity.getThirdSysFk());
+            List<UdiRlSupResponse> udiRelevanceEntities = udiRelevanceService.selectListByThirdId(thrOrderDetailEntity.getProductId(), thrOrderEntity.getThirdSysFk());
             IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
-            UdiRelevanceResponse udiRelevanceResponse = null;
+            UdiRlSupResponse udiRelevanceResponse = null;
             if (udiRelevanceEntities.size() == 1) {
                 udiRelevanceResponse = udiRelevanceEntities.get(0);
                 ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getId());
@@ -305,7 +306,8 @@ public class IoOrderDetailBizController extends BaseController {
                 ioOrderDetailBizEntity.setManufacturer(udiRelevanceResponse.getManufactory());
                 ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname());
                 ioOrderDetailBizEntity.setSpec(udiRelevanceResponse.getGgxh());
-                ioOrderDetailBizEntity.setPrice(udiRelevanceResponse.getPrice());
+                ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(Double.valueOf(udiRelevanceResponse.getPrice())));
+                ioOrderDetailBizEntity.setSupId(udiRelevanceResponse.getCustomerId() + "");
             } else {
                 ioOrderDetailBizEntity.setCoName(thrOrderDetailEntity.getCorpName());
                 ioOrderDetailBizEntity.setCertCode(thrOrderDetailEntity.getZczbhhzbapzbh());
@@ -316,7 +318,7 @@ public class IoOrderDetailBizController extends BaseController {
 
                 if (udiRelevanceEntities.size() > 1) {
                     String bindRlIds = "";
-                    for (UdiRelevanceResponse temp : udiRelevanceEntities) {
+                    for (UdiRlSupResponse temp : udiRelevanceEntities) {
                         bindRlIds = bindRlIds + "," + temp.getId();
                     }
                     ioOrderDetailBizEntity.setBindRlIds(bindRlIds.substring(1));

src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java

@@ -100,16 +100,7 @@ public class ThrDeptController {
         }
         String id = Long.toString(thrDeptEntity.getId());
         ThrDeptEntity thrDeptEntity1 = thrDeptService.selectById(id);
-        //查询该部门下的仓库
-        filterThrSubInvWarehouseRequest.setParentId(thrDeptEntity1.getCode());
-        List<ThrInvWarehouseEntity> thrDept = thrInvWarehouseService.filterThrInvWarehouse(filterThrSubInvWarehouseRequest);
 
-        for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrDept) {
-            thrInvWarehouseEntity.setParentId(thrDeptEntity.getCode());
-            thrInvWarehouseEntity.setThirdSysFk(thrDeptEntity.getThirdSysFk());
-            //修改仓库
-            thrInvWarehouseService.updateThrInvWarehouse(thrInvWarehouseEntity);
-        }
         //判断部门是否存在
         filterThrDeptRequest.setCode(thrDeptEntity.getCode());
         filterThrDeptRequest.setName(thrDeptEntity.getName());
@@ -122,6 +113,16 @@ public class ThrDeptController {
             if (!b) {
                 return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
             }
+            //查询该部门下的仓库
+            filterThrSubInvWarehouseRequest.setParentId(thrDeptEntity1.getCode());
+            List<ThrInvWarehouseEntity> thrDept = thrInvWarehouseService.filterThrInvWarehouse(filterThrSubInvWarehouseRequest);
+
+            for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrDept) {
+                thrInvWarehouseEntity.setParentId(thrDeptEntity.getCode());
+                thrInvWarehouseEntity.setThirdSysFk(thrDeptEntity.getThirdSysFk());
+                //修改仓库
+                thrInvWarehouseService.updateThrInvWarehouse(thrInvWarehouseEntity);
+            }
             return ResultVOUtils.success();
         } else {
             return ResultVOUtils.error(ResultEnum.DATA_REPEAT);

src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java

@@ -5,6 +5,7 @@ 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.BasicProcessStatus;
+import com.glxp.api.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity;
 import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
 import com.glxp.api.http.ErpBasicClient;
@@ -118,6 +119,11 @@ public class ThrProductsExportLogController {
     @PostMapping("/udiwms/thrProducts/importLog/export")
     public BaseResponse excelDownload(@RequestBody ThrProductsExportRequest thrProductsExportRequest) {
         ThrProductsExportLogEntity thrProductsExportLogEntity = new ThrProductsExportLogEntity();
+        FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
+        filterThrProductsRequest.setThirdSysFk(thrProductsExportRequest.getThirdSys());
+        filterThrProductsRequest.setThirdSys(thrProductsExportRequest.getThirdSys());
+        List<ThrProductsEntity> thrProductsEntities = thrProductsService.filterThrProducts1(filterThrProductsRequest);
+        thrProductsExportRequest.setThrProductsEntities(thrProductsEntities);
         thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS);
         String genKey = CustomUtil.getId();
         String fileName = "D:\\udiwms\\exportFile\\" + "第三方产品信息" + genKey + ".UpperIn";

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

@@ -36,7 +36,6 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
     private String thrPiId;
 
 
-
     private Boolean isCheck;
 
     private Integer filterType;         //0:全部，1.对照完成，2.未对照DI，3.未对照产品编码，4.未对照其他产品编码
@@ -53,5 +52,6 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
 
     private String corpId;
     private String billType;
+    private String flbm;
     private List<String> uuids;
 }

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

@@ -13,4 +13,5 @@ public class FilterCompanyProductRelevanceRequest extends ListPageRequest {
     private String unitFk;
     private String lastUpdateTime;
     private String key;
+    private String flbm;
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
+import com.glxp.api.res.basic.UdiRlSupResponse;
 
 import java.util.List;
 
@@ -71,7 +72,7 @@ public interface UdiRelevanceService extends IService<UdiRelevanceEntity> {
 
     UdiRelevanceEntity selectByThirdId(String thirdId, String thirdSys);
 
-    List<UdiRelevanceResponse> selectListByThirdId(String thirdId, String thirdSys);
+    List<UdiRlSupResponse> selectListByThirdId(String thirdId, String thirdSys);
 
     boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity);
 

src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java

@@ -9,9 +9,12 @@ import com.glxp.api.dao.basic.UdiRelevanceDao;
 import com.glxp.api.entity.basic.UdiEntity;
 import com.glxp.api.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.entity.thrsys.ThrSystemEntity;
+import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
+import com.glxp.api.res.basic.UdiRlSupResponse;
 import com.glxp.api.service.basic.UdiRelevanceService;
+import com.glxp.api.service.basic.UdiRlSupService;
 import com.glxp.api.service.thrsys.ThrSystemService;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import org.springframework.stereotype.Service;
@@ -27,6 +30,8 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
     @Resource
     UdiRelevanceDao udiRelevanceDao;
     @Resource
+    UdiRlSupService udiRlSupService;
+    @Resource
     ThrSystemService basicThirdSysService;
 
     @Override
@@ -320,12 +325,12 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
     }
 
     @Override
-    public List<UdiRelevanceResponse> selectListByThirdId(String thirdId, String thirdSys) {
+    public List<UdiRlSupResponse> selectListByThirdId(String thirdId, String thirdSys) {
         if (StrUtil.isEmpty(thirdId) || StrUtil.isEmpty(thirdSys)) {
             return null;
         }
 
-        FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
+        CompanyProductRelevanceRequest filterUdiRelRequest = new CompanyProductRelevanceRequest();
         if ("thirdId".equals(thirdSys)) {
             filterUdiRelRequest.setThirdId(thirdId);
         } else if ("thirdId1".equals(thirdSys)) {
@@ -337,7 +342,8 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
         } else if ("thirdId4".equals(thirdSys)) {
             filterUdiRelRequest.setThirdId4(thirdId);
         }
-        List<UdiRelevanceResponse> data = udiRelevanceDao.filterUdiGp(filterUdiRelRequest);
+        filterUdiRelRequest.setDiType(1);
+        List<UdiRlSupResponse> data = udiRlSupService.filterUdiGp(filterUdiRelRequest);
         return data;
     }
 

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

@@ -1327,7 +1327,6 @@ public class HeartService {
                     });
                     if (response.getCode() == 20000 && response.getData() != null) {
 
-
                         JSONArray fileJson = JSONUtil.parseObj(response.getData()).getJSONArray("syncFiles");
                         SpsSyncOrderResponse syncDataResponse = JSONObject.parseObject(response.getData(), new TypeReference<SpsSyncOrderResponse>() {
                         });
@@ -1342,9 +1341,7 @@ public class HeartService {
                         basicDownloadStatusEntity.setRemark(syncDataResponse.getSyncRemark());
                         basicDownloadStatusEntity.setScheduleType(1);
                         basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity);
-
                         if (CollUtil.isNotEmpty(syncDataResponse.getOrderEntities())) {
-                            try {
                             List<IoOrderEntity> orderEntities = syncDataResponse.getOrderEntities();
                             for (IoOrderEntity orderEntity : orderEntities) {
                                 SyncDataBustypeEntity syncDataBustypeEntity = syncDataBustypeService.findByAction(orderEntity.getAction(), 2);
@@ -1385,11 +1382,6 @@ public class HeartService {
                                     idcService.batchDownloadFile(spGetHttp.getIpUrl(), syncFiles.toArray(new String[syncFiles.size()]));
                                 }
                             }
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
-
-
                         }
                         spGetHttp.finishTask(basicExportStatusEntity.getId());
                         basicDownloadStatusEntity.setUpdateTime(new Date());
@@ -1867,7 +1859,7 @@ public class HeartService {
             List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities();
             for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
                 if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
-                    orderInvoiceService.insertInvoice(orderInvoiceEntity);
+                    ioOrderInvoiceMapper.insertOrUpdate(orderInvoiceEntity);
                 }
             }
         }

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

@@ -20,8 +20,8 @@ import javax.annotation.Resource;
 import java.util.Arrays;
 
 
-//@Component
+@Component
-//@EnableScheduling
+@EnableScheduling
 public class SyncHeartTask implements SchedulingConfigurer {
 
     final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class);

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

@@ -163,7 +163,7 @@
                 AND basic_products.originUuid is NULL
             </if>
             <if test="filterType != null and filterType == 3">
-                AND (basic_udirel.thirdId IS NULL or basic_udirel.thirdId='')
+                AND (basic_udirel.thirdId IS NULL or basic_udirel.thirdId = '')
                 and basic_products.originUuid <![CDATA[<>]]> ''
             </if>
             <if test="filterType != null and filterType == 4">
@@ -215,6 +215,10 @@
             <if test="isDisable == false">
                 AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false)
             </if>
+
+            <if test="flbm != '' and flbm != null">
+                and (tp.flbm = #{flbm} or basic_products.flbm = #{flbm})
+            </if>
         </where>
         ORDER BY company_product_relevance.updateTime DESC
     </select>
@@ -289,10 +293,10 @@
     <insert id="insertCompanyProductRelevance"
             parameterType="com.glxp.api.entity.basic.UdiRlSupEntity">
         replace
-        INTO company_product_relevance(id,customerId, productId, enterpriseId, registrationId,
+                INTO company_product_relevance(id, customerId, productId, enterpriseId, registrationId,
                                                createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk,
                                                price, createUser, updateUser)
-        values (#{id},#{customerId},
+        values (#{id}, #{customerId},
                 #{productId},
                 #{enterpriseId},
                 #{registrationId},