销售订单添加生产状态

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractVo.java

@@ -229,5 +229,10 @@ public class ContractVo extends Contract {
      */
     private String deptName;
 
+    /**
+     * 生产状态
+     */
+    private Integer produceStatus;
+
 }
 

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -18,10 +18,12 @@
                            us.user_id                        salesmanId,
                            (SELECT IFNULL(SUM(cc.contract_money), 0)
                             FROM claim_contract cc
-                            WHERE cc.contract_id = t1.id) AS sumClaimMoney
+                            WHERE cc.contract_id = t1.id) AS sumClaimMoney,
+                           po.produce_status
                     FROM contract t1
                              left join customer c on t1.buy_corporation_id = c.id
-                             left join sys_user us on c.user_id = us.user_id) t1
+                             left join sys_user us on c.user_id = us.user_id
+                             LEFT JOIN production_order po ON po.contract_id = t1.id) t1
               GROUP BY t1.id) t1
             ${ew.customSqlSegment}
     </select>

hx-wms/src/main/java/com/fjhx/wms/mapper/stock/StockWaitDetailsMapper.java

@@ -1,8 +1,8 @@
 package com.fjhx.wms.mapper.stock;
 
-import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import com.fjhx.wms.entity.stock.vo.StockWaitDetailsVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param;
  * 待出入库明细 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-13
  */
 public interface StockWaitDetailsMapper extends BaseMapper<StockWaitDetails> {
@@ -23,4 +23,6 @@ public interface StockWaitDetailsMapper extends BaseMapper<StockWaitDetails> {
      */
     Page<StockWaitDetailsVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<StockWaitDetails> wrapper);
 
+    void updateOrderStatusByContractId(@Param("contractId") Long contractId, @Param("status") Integer status);
+
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitDetailsServiceImpl.java

@@ -11,6 +11,7 @@ import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.wms.entity.stock.dto.StockWaitDetailsDto;
 import com.fjhx.wms.entity.stock.dto.StockWaitDetailsSelectDto;
 import com.fjhx.wms.entity.stock.dto.StockWaitDto;
+import com.fjhx.wms.entity.stock.emums.JournalType;
 import com.fjhx.wms.entity.stock.po.StockWait;
 import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import com.fjhx.wms.entity.stock.vo.StockWaitDetailsVo;
@@ -23,10 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -169,6 +167,12 @@ public class StockWaitDetailsServiceImpl extends ServiceImpl<StockWaitDetailsMap
         StockWait byId = stockWaitService.getById(stockWaitDto.getId());
         if (statusFlag == stockWaitDetailsList.size()) {
             byId.setStatus(2);//入库完成
+
+            //销售出库 修改生产订单为已出库
+            if (Objects.equals(JournalType.SALE_OUT, JournalType.getByDetailType(byId.getBusinessType()))) {
+                Long businessId = byId.getBusinessId();
+                baseMapper.updateOrderStatusByContractId(businessId, 10);
+            }
         } else {
             byId.setStatus(1);//部分入库
         }

hx-wms/src/main/resources/mapper/stock/StockWaitDetailsMapper.xml

@@ -17,10 +17,15 @@
             swd.update_user,
             swd.update_time,
             swd.victoriatourist_json
-        FROM
-            stock_wait_details swd
-                JOIN stock_wait sw ON swd.stock_wait_id = sw.id
+        FROM stock_wait_details swd
+                 JOIN stock_wait sw ON swd.stock_wait_id = sw.id
             ${ew.customSqlSegment}
     </select>
 
+    <update id="updateOrderStatusByContractId">
+        UPDATE production_order
+        SET produce_status = #{status}
+        WHERE contract_id = ${contractId}
+    </update>
+
 </mapper>