wms手持成品生成记录接口

master
mengjiao 8 months ago
parent fa8e9d40e6
commit a8e76d04cc

@ -622,8 +622,18 @@ public class WmsToWCSmissionController {
List<BaseEquipment> list = wmsProductPutService.selectBaseEquipmentList(baseEquipment);
return success(list);
}
//根据线体查询单子
@PostMapping("/listProOrderWorkorder")
public AjaxResult listProOrderWorkorder(@RequestBody ProOrderWorkorder proOrderWorkorder) {
List<ProOrderWorkorder> list = wmsProductPutService.listProOrderWorkorder(proOrderWorkorder);
return success(list);
}
//保存--成品生产记录
@PostMapping("/finishedProductProductionRecords")
public AjaxResult finishedProductProductionRecords(@RequestBody ProOrderWorkorder proOrderWorkorder) {
List<ProOrderWorkorder> list = wmsProductPutService.listProOrderWorkorder(proOrderWorkorder);
return success(list);
}
/**
* RGV RFID WMS
* RFID

@ -73,4 +73,6 @@ public interface WmsOdsWhiteEmbryoInMapper {
WmsOdsWhiteEmbryoIn selectWmsOdsWhiteEmbryoInByOrderCodeAndUserDefined1(WmsOdsWhiteEmbryoIn wmsOdsWhiteEmbryoIn);
String selectByOrderAndBc(@Param("proOrderWorkorderBatch") ProOrderWorkorderBatch proOrderWorkorderBatch,@Param("orderCode") String orderCode);
List<ProOrderWorkorder> listProOrderWorkorder(ProOrderWorkorder proOrderWorkorder);
}

@ -132,4 +132,6 @@ public interface IWmsProductPutService {
String finishedProductSalesReturnTD(WmsRuturnPutEmbryo wmsRuturnPutEmbryo);
List<BaseEquipment> selectBaseEquipmentList(BaseEquipment baseEquipment);
List<ProOrderWorkorder> listProOrderWorkorder(ProOrderWorkorder proOrderWorkorder);
}

@ -990,6 +990,13 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
return baseEquipments;
}
@Override
public List<ProOrderWorkorder> listProOrderWorkorder(ProOrderWorkorder proOrderWorkorder) {
DynamicDataSourceContextHolder.push("ds_" + proOrderWorkorder.getFactoryCode());
List<ProOrderWorkorder> workorderList= wmsOdsWhiteEmbryoInMapper.listProOrderWorkorder(proOrderWorkorder);
return workorderList;
}
@Override
public List<WmsRuturnPutEmbryo> FinishedProductSalesReturn(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) {
DynamicDataSourceContextHolder.push("ds_" + wmsRuturnPutEmbryo.getFactoryCode());

@ -285,5 +285,26 @@
<include refid="selectWmsOdsWhiteEmbryoInVo"/>
WHERE Active='1' AND Order_Code=#{orderCode} AND User_Defined1=#{userDefined1}
</select>
<select id="listProOrderWorkorder" resultType="com.op.wms.domain.ProOrderWorkorder">
SELECT
pro_order_workorder.workorder_code_sap AS workorderCodeSap,
pro_order_workorder.status AS status,
pro_order_workorder_batch.batch_code AS batchCode,
pro_order_workorder.product_code AS productCode,
pro_order_workorder.product_name AS productName,
pro_order_workorder.unit AS unit,
pro_order_workorder.workorder_name AS workorderName
FROM
pro_order_workorder
LEFT JOIN pro_order_workorder_batch ON pro_order_workorder_batch.workorder_id= pro_order_workorder.workorder_id
WHERE
pro_order_workorder.parent_order= '0'
AND pro_order_workorder_batch.del_flag= '0'
AND pro_order_workorder.status IN('w2','w3')
AND pro_order_workorder.product_date= CONVERT(DATE, GETDATE())
<if test="workorderName != null">AND pro_order_workorder.workorder_name= #{workorderName}</if>
<if test="workorderCodeSap != null">AND pro_order_workorder.workorder_code_sap= #{workorderCodeSap}</if>
<if test="batchCode != null">AND pro_order_workorder_batch.batch_code= #{batchCode}</if>
<if test="productCode != null">AND pro_order_workorder.product_code= #{productCode}</if>
</select>
</mapper>

Loading…
Cancel
Save