浏览代码

合同添加下发生产时间

yzc 1 年之前
父节点
当前提交
3c57b1e1e6

+ 8 - 2
hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderServiceImpl.java

@@ -43,6 +43,7 @@ import com.fjhx.sale.service.contract.ContractProductService;
 import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.socket.core.PushTypeEnum;
 import com.fjhx.socket.core.WebSocketPush;
+import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -216,8 +217,13 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
         //获取合同信息
         Contract contract = contractService.getById(contractId);
         Assert.notEmpty(contract, "查询不到合同信息!");
-        contractService.update(q -> q.eq(Contract::getId, contractId).set(Contract::getOrderDistributeStatus, 1));
-
+        contractService.update(q -> q
+                .eq(Contract::getId, contractId)
+                .set(Contract::getOrderDistributeStatus, 1)
+                .set(Contract::getOrderDistributeTime, new Date())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
 
         produceOrderDto.setCode(contract.getCode());
         produceOrderDto.setProduceStatus(0);

+ 24 - 29
hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -244,11 +244,6 @@ public class Contract extends BasePo {
     private String currencyRateJson;
 
     /**
-     * 尔弘时代JSON扩展字段
-     */
-    private String ehsdJson;
-
-    /**
      * beneficiaryName
      */
     private String beneficiaryName;
@@ -348,30 +343,30 @@ public class Contract extends BasePo {
     @Version
     private Integer version;
 
-	/**
-	 * 是否显示
-	 */
-	private Integer isShow;
-
-	/**
-	 * 数据JSON
-	 */
-	private String dataJson;
-
-	/**
-	 * 订单下发状态
-	 */
-	private Integer orderDistributeStatus;
-
-	/**
-	 * 交接单附件列表
-	 */
-	@TableField(exist = false)
-	private List<ObsFile> fileList;
-
-	/**
-	 * 包装附件列表
-	 */
+    /**
+     * 是否显示
+     */
+    private Integer isShow;
+
+    /**
+     * 订单下发状态
+     */
+    private Integer orderDistributeStatus;
+
+    /**
+     * 订单下发时间
+     */
+    private Integer orderDistributeTime;
+
+    /**
+     * 交接单附件列表
+     */
+    @TableField(exist = false)
+    private List<ObsFile> fileList;
+
+    /**
+     * 包装附件列表
+     */
     @TableField(exist = false)
     private List<ObsFile> packageFileList;
 

+ 0 - 6
hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -94,7 +94,6 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
 import com.ruoyi.framework.config.ThreadPoolConfig;
 import com.ruoyi.system.service.ISysDeptService;
-import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.utils.UserUtil;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -138,10 +137,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
 
     @Autowired
     private CustomerService customerService;
-
-    @Autowired
-    private ISysUserService sysUserService;
-
     @Autowired
     private CorporationService corporationService;
 
@@ -1057,7 +1052,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         );
         Map<Long, List<EhsdPurchase>> purchaseMap = purchaseList.stream().collect(Collectors.groupingBy(EhsdPurchase::getDataResourceId));
         for (ContractBudgetVo v : list) {
-            v.setDataJson(null);
             v.setOtherIncomeAmount(BigDecimal.ZERO);//暂时先设置其他收入为0
 
             v.setRmbContractAmount(v.getAmount().multiply(v.getRate()));//计算汇算人民币