yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierprocurementplan/BpmOASupplierProcurementPlanPageReqVO.java

@@ -48,9 +48,6 @@ public class BpmOASupplierProcurementPlanPageReqVO extends PageParam {
     @Schema(description = "是否上传凭证 0否 1是")
     private Integer certificateFlag;
 
-    @Schema(description = "是否已分配到资产中 0否 1是", example = "5984")
-    private Integer assignedFlag;
-
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierprocurementplan/BpmOASupplierProcurementPlanReqVO.java

@@ -17,9 +17,6 @@ public class BpmOASupplierProcurementPlanReqVO {
     @Schema(description = "供应商id", example = "123")
     private Long supplierId;
 
-    @Schema(description = "是否已分配到资产中 0否 1是", example = "5984")
-    private Integer assignedFlag;
-
     @Schema(description = "流程实例的编号", example = "5984")
     private String processInstanceId;
 

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierprocurementplan/BpmOASupplierProcurementPlanRespVO.java

@@ -41,9 +41,6 @@ public class BpmOASupplierProcurementPlanRespVO {
     @Schema(description = "备注")
     private String remark;
 
-    @Schema(description = "是否已分配到资产中 0否 1是", example = "5984")
-    private Integer assignedFlag;
-
     @Schema(description = "流程实例的编号", example = "5984")
     private String processInstanceId;
 

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplierprocurementplan/BpmOASupplierProcurementPlanSaveReqVO.java

@@ -42,9 +42,6 @@ public class BpmOASupplierProcurementPlanSaveReqVO {
     @Schema(description = "备注")
     private String remark;
 
-    @Schema(description = "是否已分配到资产中 0否 1是", example = "5984")
-    private Integer assignedFlag;
-
     @Schema(description = "流程实例的编号", example = "5984")
     private String processInstanceId;
 

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASupplierProcurementPlanDO.java

@@ -70,10 +70,6 @@ public class BpmOASupplierProcurementPlanDO extends BaseDO {
      * 备注
      */
     private String remark;
-    /**
-     * 是否已分配到资产中 0否 1是
-     */
-    private Integer assignedFlag;
     /**
      * 流程实例的编号
      */

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASupplierProcurementPlanServiceImpl.java

@@ -165,11 +165,10 @@ public class BpmOASupplierProcurementPlanServiceImpl extends BpmOABaseService im
     public void uploadDeliveryReceipt(TheArrivalFileItemsVO vo) {
         BpmOASupplierProcurementPlanDO supplierProcurementPlanDO = oaSupplierProcurementPlanMapper.selectById(vo.getId());
         //判断是否需要更新到资产
-        boolean updateAssetFlag = false;
+        Boolean updateAssetFlag = false;
-        if (supplierProcurementPlanDO.getAssignedFlag() == 0) {
+        if (CollectionUtil.isEmpty(supplierProcurementPlanDO.getTheArrivalFileItems())) {
             updateAssetFlag = true;
         }
-        supplierProcurementPlanDO.setAssignedFlag(1);
         supplierProcurementPlanDO.setTheArrivalFileItems(vo.getTheArrivalFileItems());
         oaSupplierProcurementPlanMapper.updateById(supplierProcurementPlanDO);
         // ----- 如果需要更新到资产 -