问题处理

hx-mes/src/main/java/com/fjhx/mes/controller/production/ProduceOrderController.java

@@ -6,6 +6,7 @@ import com.fjhx.mes.entity.production.dto.ProduceOrderSelectDto;
 import com.fjhx.mes.entity.production.dto.ProductionOrderDto;
 import com.fjhx.mes.entity.production.vo.ProductionOrderVo;
 import com.fjhx.mes.service.production.ProduceOrderService;
+import com.fjhx.sale.entity.contract.vo.ContractVo;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -94,4 +95,12 @@ public class ProduceOrderController {
         return produceOrderService.materialBalanceList(dto.getId());
     }
 
+    /**
+     * 生产订单查看合同信息
+     */
+    @PostMapping("/contractInfo")
+    public ContractVo contractInfo(@RequestBody BaseSelectDto dto) {
+        return produceOrderService.contractInfo(dto.getId());
+    }
+
 }

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

@@ -6,6 +6,7 @@ import com.fjhx.mes.entity.production.dto.ProduceOrderSelectDto;
 import com.fjhx.mes.entity.production.dto.ProductionOrderDto;
 import com.fjhx.mes.entity.production.po.ProductionOrder;
 import com.fjhx.mes.entity.production.vo.ProductionOrderVo;
+import com.fjhx.sale.entity.contract.vo.ContractVo;
 import com.ruoyi.common.core.service.BaseService;
 
 import java.util.List;
@@ -59,4 +60,6 @@ public interface ProduceOrderService extends BaseService<ProductionOrder> {
      * 物料结存
      */
     List<MaterialBalanceBo> materialBalanceList(Long id);
+
+    ContractVo contractInfo(Long id);
 }

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

@@ -32,11 +32,13 @@ import com.fjhx.purchase.entity.subscribe.po.SubscribeDetail;
 import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
 import com.fjhx.sale.entity.arrival.po.ArrivalDetail;
 import com.fjhx.sale.entity.arrival.vo.ArrivalDetailVo;
+import com.fjhx.sale.entity.contract.dto.ContractSelectDto;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.entity.contract.po.ContractProductBom;
 import com.fjhx.sale.entity.contract.vo.ContractProductBomVo;
 import com.fjhx.sale.entity.contract.vo.ContractProductVo;
+import com.fjhx.sale.entity.contract.vo.ContractVo;
 import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProduct;
 import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProductVo;
 import com.fjhx.sale.mapper.arrival.ArrivalDetailMapper;
@@ -979,4 +981,15 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
         return materialBalanceBos;
     }
 
+    @Override
+    public ContractVo contractInfo(Long id) {
+        ProductionOrder productionOrder = this.getById(id);
+
+        ContractSelectDto dto = new ContractSelectDto();
+        dto.setId(productionOrder.getContractId());
+        dto.setProdCompanyId(productionOrder.getCompanyId());
+
+        return contractService.detail(dto);
+    }
+
 }

hx-mes/src/main/resources/mapper/production/ProduceOrderMapper.xml

@@ -67,7 +67,9 @@
               FROM production_order po
                        LEFT JOIN contract_product cp ON cp.contract_id = po.contract_id
                        LEFT JOIN contract_product_bom cpb ON cpb.contract_product_id = cp.id
+                       LEFT JOIN product_info pi ON cp.product_id = pi.id
               WHERE po.id = #{orderID}
+                AND pi.company_id = po.company_id
               GROUP BY cpb.material_id) t1
     </select>
 

hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractController.java

@@ -72,8 +72,8 @@ public class ContractController {
      * 外销合同表明细
      */
     @PostMapping("/detail")
-    public ContractVo detail(@RequestBody BaseSelectDto dto) {
-        return contractService.detail(dto.getId());
+    public ContractVo detail(@RequestBody ContractSelectDto dto) {
+        return contractService.detail(dto);
     }
 
     /**

hx-sale/src/main/java/com/fjhx/sale/entity/contract/dto/ContractSelectDto.java

@@ -124,4 +124,9 @@ public class ContractSelectDto extends BaseSelectDto {
      * 归属公司id
      */
     private Long ofCompanyId;
+
+    /**
+     * 生产公司id
+     */
+    private Long prodCompanyId;
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/ContractService.java

@@ -69,7 +69,7 @@ public interface ContractService extends BaseService<Contract> {
     /**
      * 外销合同表明细
      */
-    ContractVo detail(Long id);
+    ContractVo detail(ContractSelectDto id);
 
     /**
      * 外销合同表新增

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

@@ -1187,7 +1187,8 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     }
 
     @Override
-    public ContractVo detail(Long id) {
+    public ContractVo detail(ContractSelectDto dto) {
+        Long id = dto.getId();
         ContractVo result = baseMapper.detail(id);
         Assert.notEmpty(result, "查询不到合同信息");
 
@@ -1213,7 +1214,10 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             result.setShroffAccountName(accountManagement.getName());
         }
 
-        List<ContractProductVo> contractProductVos = contractProductService.getList(IWrapper.<ContractProduct>getWrapper().eq(ContractProduct::getContractId, id));
+        List<ContractProductVo> contractProductVos = contractProductService.getList(IWrapper.<ContractProduct>getWrapper()
+                .eq("cp", ContractProduct::getContractId, id)
+                .eq("pi.company_id", dto.getProdCompanyId())
+        );
         List<Long> contractProductIds = contractProductVos.stream().map(ContractProduct::getId).collect(Collectors.toList());