问题处理

hx-jxst/src/main/java/com/fjhx/jxst/entity/after/dto/AfterSalesRecordSelectDto.java

@@ -14,4 +14,9 @@ import lombok.Setter;
 @Setter
 public class AfterSalesRecordSelectDto extends BaseSelectDto {
 
+    /**
+     * 销售合同id
+     */
+    private Long contractId;
+
 }

hx-jxst/src/main/java/com/fjhx/jxst/entity/statement/bo/SettlementBo.java

@@ -74,4 +74,9 @@ public class SettlementBo {
      * 其他费用
      */
     private BigDecimal otherFee;
+
+    /**
+     * 合同是否结清
+     */
+    private Integer isSettled;
 }

hx-jxst/src/main/java/com/fjhx/jxst/service/after/impl/AfterSalesRecordServiceImpl.java

@@ -85,6 +85,9 @@ public class AfterSalesRecordServiceImpl extends ServiceImpl<AfterSalesRecordMap
                 new SqlField("asr",AfterSalesRecord::getAmount)
         );
 
+        //合同id过滤
+        wrapper.eq("scd.sales_contract_id",dto.getContractId());
+
         wrapper.orderByDesc("asr", AfterSalesRecord::getId);
         Page<AfterSalesRecordVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<AfterSalesRecordVo> records = page.getRecords();

hx-jxst/src/main/java/com/fjhx/jxst/service/sales/impl/SalesContractServiceImpl.java

@@ -268,6 +268,7 @@ public class SalesContractServiceImpl extends ServiceImpl<SalesContractMapper, S
                 new SqlField("sc.code")
         );
 
+        //是否结清
         wrapper.eq("sc.is_settled", dto.getIsSettled());
 
 

hx-jxst/src/main/resources/mapper/after/AfterSalesRecordMapper.xml

@@ -16,6 +16,11 @@
                asr.after_sales_remark,
                asr.amount
         from after_sales_record asr
+                 LEFT JOIN bytesailing_mes.production_task_detail ptd ON ptd.product_sn = asr.product_sn
+                 JOIN bytesailing_mes.production_task pt ON ptd.production_task_id = pt.id
+                 JOIN bytesailing_mes.production_plan pp ON pt.production_plan_id = pp.id
+                 JOIN bytesailing_mes.work_order wo ON pp.work_order_id = wo.id
+                 JOIN sales_contract_details scd ON wo.contract_details_id = scd.id
             ${ew.customSqlSegment}
     </select>
 

hx-jxst/src/main/resources/mapper/sales/SalesContractMapper.xml

@@ -78,7 +78,8 @@
             sc.trailer_fee AS trailerFee,
             sc.inspection_red_pack_fee AS inspectionRedPackFee,
             sc.commission_fee AS commissionFee,
-            sc.other_fee AS otherFee
+            sc.other_fee AS otherFee,
+            sc.is_settled
         FROM
             sales_contract sc
             LEFT JOIN bytesailing_customer.customer cu ON sc.customer_id = cu.id

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

@@ -201,6 +201,7 @@ public class ProductionTaskServiceImpl extends ServiceImpl<ProductionTaskMapper,
         stockWait.setBusinessType(StockWaitType.PRODUCTION_TASK_OUT.getDetailType());//生产任务出库
         stockWait.setBusinessCode(productionTaskDto.getCode());
         stockWait.setBusinessId(productionTaskDto.getId());
+        stockWait.setWorkOrderId(workOrder.getId());
         stockWaitService.save(stockWait);
         //创建待出库明细
         List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();

hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/StockJournal.java

@@ -60,4 +60,9 @@ public class StockJournal extends BasePo {
      */
     private String receivingPerson;
 
+    /**
+     * 工单Id
+     */
+    private Long workOrderId;
+
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/StockWait.java

@@ -67,4 +67,9 @@ public class StockWait extends BasePo {
      */
     private String victoriatouristJson;
 
+    /**
+     * 工单id
+     */
+    private Long workOrderId;
+
 }

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

@@ -372,7 +372,9 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         stockJournal.setCode(stockDto.getType() == 1 ? CodeEnum.SIN_CODE.getCode() : CodeEnum.SOUT_CODE.getCode());
         stockJournal.setWarehouseId(stockDto.getWarehouseId());
 
-        stockJournal.setBusinessId(stockDto.getWorkOrderId());
+        stockJournal.setWorkOrderId(stockDto.getWorkOrderId());
+
+        stockJournal.setBusinessId(stockDto.getBusinessId());
         stockJournal.setExWarehousePerson(stockDto.getExWarehousePerson());
         stockJournal.setReceivingPerson(stockDto.getReceivingPerson());
         //保存出入库记录
@@ -407,8 +409,12 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         stockJournal.setOpType(stockDto.getType());
         stockJournal.setCode(stockDto.getType() == 1 ? CodeEnum.SIN_CODE.getCode() : CodeEnum.SOUT_CODE.getCode());
         stockJournal.setType(JournalType.MANUAL_OUT.getDetailType());
+
+        stockJournal.setWorkOrderId(stockDto.getWorkOrderId());
+
+
         stockJournal.setWarehouseId(stockDto.getWarehouseId());
-        stockJournal.setBusinessId(stockDto.getWorkOrderId());
+        stockJournal.setBusinessId(stockDto.getBusinessId());
         stockJournal.setExWarehousePerson(stockDto.getExWarehousePerson());
         stockJournal.setReceivingPerson(stockDto.getReceivingPerson());
 

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

@@ -170,6 +170,10 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         stockJournal.setCode(stockWait.getType() == 1 ? CodeEnum.SIN_CODE.getCode() : CodeEnum.SOUT_CODE.getCode());
         stockJournal.setWarehouseId(warehouseId);
         stockJournal.setBusinessId(stockWait.getId());
+
+        //目前只有 生产任务物料待出库 有工单id
+        stockJournal.setWorkOrderId(stockWait.getWorkOrderId());
+
         //入库人员信息
         stockJournal.setExWarehousePerson(dto.getExWarehousePerson());
         stockJournal.setReceivingPerson(dto.getReceivingPerson());