问题处理

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -471,6 +471,11 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
      * 保存修改产品原材料
      */
     private void saveOrEditRawMaterial(ProductInfoDto productInfoDto) {
+        //操作非产品时跳过
+        if (ObjectUtil.notEqual(productInfoDto.getDefinition(), 1)) {
+            return;
+        }
+
         Long rawMaterialId = productInfoDto.getRawMaterialId();
         Assert.notEmpty(rawMaterialId, "原材料Id不能为空");
 

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionTaskProgressServiceImpl.java

@@ -10,6 +10,7 @@ import com.fjhx.mes.entity.production.po.ProductionTaskProgress;
 import com.fjhx.mes.entity.production.vo.ProductionTaskProgressVo;
 import com.fjhx.mes.mapper.production.ProductionTaskProgressMapper;
 import com.fjhx.mes.service.production.ProductionTaskProgressService;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,7 @@ public class ProductionTaskProgressServiceImpl extends ServiceImpl<ProductionTas
 
     private IWrapper<ProductionTaskProgress> getWorkshopReportWrapper(ProductionTaskProgressSelectDto dto) {
         IWrapper<ProductionTaskProgress> wrapper = getWrapper();
+        wrapper.in("pod.company_id", SecurityUtils.getCompanyIds());
         return wrapper;
     }
 

hx-sale/src/main/java/com/fjhx/sale/flow/ContractFlow.java

@@ -146,9 +146,9 @@ public class ContractFlow extends FlowDelegate {
             //赋值合同Id
             cp.setContractId(contract.getId());
             //保存设计稿图
-            ObsFileUtil.editFile(cp.getFileList(), cp.getId());
+            ObsFileUtil.editFile(cp.getFileList(), cp.getId(), 1);
             //保存生产源文件
-            ObsFileUtil.copyFileAndSave(cp.getProdFileList(), cp.getId(), 1);
+            ObsFileUtil.copyFileAndSave(cp.getProdFileList(), cp.getId(), 2);
 
             //赋值产品BOM信息
             List<ContractProductBom> contractProductBomList = cp.getContractProductBomList();