diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteQualityService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteQualityService.java index 71e2a74cf..37aad484d 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteQualityService.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteQualityService.java @@ -44,4 +44,7 @@ public interface RemoteQualityService { @PostMapping("/qcDetail/resendWXTask") public R resendWXTask(); + + @PostMapping("/qcInventory/createCCTask") + public R createCCTask(); } diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseProductDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseProductDTO.java index ca164f14a..288abdcd1 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseProductDTO.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseProductDTO.java @@ -233,6 +233,46 @@ public class BaseProductDTO extends BaseEntity { /** 其它 */ @Excel(name = "其它") private String other; + /**标准模板**/ + private String mvgr5; + /**单位**/ + private String meins; + //转换分子 + private String umrez; + //转换分母 + private String umren; + + public String getUmren() { + return umren; + } + + public void setUmren(String umren) { + this.umren = umren; + } + + public String getUmrez() { + return umrez; + } + + public void setUmrez(String umrez) { + this.umrez = umrez; + } + + public String getMeins() { + return meins; + } + + public void setMeins(String meins) { + this.meins = meins; + } + + public String getMvgr5() { + return mvgr5; + } + + public void setMvgr5(String mvgr5) { + this.mvgr5 = mvgr5; + } public void setCategory(String category) { this.category = category; diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteQualityFallbackFactory.java b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteQualityFallbackFactory.java index 05c34975b..9673c5cfd 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteQualityFallbackFactory.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteQualityFallbackFactory.java @@ -62,6 +62,11 @@ public class RemoteQualityFallbackFactory implements FallbackFactory createTimeArray; + + // 创建日期开始 + private String createTimeStart; + + // 创建日期结束 + private String createTimeEnd; + public String getPicturePath() { return picturePath; } @@ -790,6 +799,32 @@ public class EquOrder extends BaseEntity { this.itemTools = itemTools; } + public List getCreateTimeArray() { + return createTimeArray; + } + + public void setCreateTimeArray(List createTimeArray) { + this.createTimeArray = createTimeArray; + } + + + //创建时间 + public String getCreateTimeStart() { + return createTimeStart; + } + + public void setCreateTimeStart(String createTimeStart) { + this.createTimeStart = createTimeStart; + } + + public String getCreateTimeEnd() { + return createTimeEnd; + } + + public void setCreateTimeEnd(String createTimeEnd) { + this.createTimeEnd = createTimeEnd; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java index c405621da..4419651de 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java @@ -154,6 +154,16 @@ public class EquOrderServiceImpl implements IEquOrderService { @DS("#header.poolName") public List selectEquOrderList(EquOrder equOrder) { + // 创建时间列表不为空 + if (equOrder.getCreateTimeArray() != null) { + // 设置创建日期开始和结束值 + if (equOrder.getCreateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equOrder.setCreateTimeStart(formatter.format(equOrder.getCreateTimeArray().get(0))); + equOrder.setCreateTimeEnd(formatter.format(equOrder.getCreateTimeArray().get(1))); + } + } + // 循环开始时间列表不为空 if (equOrder.getLoopStartArray() != null) { equOrder.setLoopStart(equOrder.getLoopStartArray().get(0)); @@ -202,6 +212,7 @@ public class EquOrderServiceImpl implements IEquOrderService { @DS("#header.poolName") public AjaxResult insertEquOrder(EquOrder equOrder) { equOrder.setCreateTime(DateUtils.getNowDate()); + equOrder.setCreateBy(SecurityUtils.getUsername()); return success(); } diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml index 27598cf64..a15708eb4 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml @@ -130,7 +130,8 @@ and eo.attr3 = #{attr3} and eo.del_flag = #{delFlag} and eo.create_by like concat('%', #{createBy}, '%') - and CONVERT(date,eo.create_time) = #{createTime} + and CONVERT(date,eo.create_time) >= #{createTimeStart} + and #{createTimeEnd} >= CONVERT(date,eo.create_time) and eo.update_by like concat('%', #{updateBy}, '%') and CONVERT(date,eo.update_time) = #{updateTime} and eo.upkeep = #{upkeep} diff --git a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointWaterMapper.xml b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointWaterMapper.xml index 9b22b75d8..1cdab4a67 100644 --- a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointWaterMapper.xml +++ b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointWaterMapper.xml @@ -75,16 +75,16 @@ and price = #{price} and (report_point_water.monitor_id = #{monitorSubset} OR report_point_water.monitor_id IN - (SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors))) + (SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0)) - and begin_time between #{params.beginBeginTime} and #{params.endBeginTime} + and CONVERT(VARCHAR(17), begin_time, 120) between #{params.beginBeginTime} and #{params.endBeginTime} - and begin_time between #{params.startTime} and #{params.endTime} + and CONVERT(VARCHAR(17), begin_time, 120) between #{params.startTime} and #{params.endTime} - and begin_time between #{params.beginCollectTime} and #{params.endCollectTime} + and CONVERT(VARCHAR(17), begin_time, 120) between #{params.beginCollectTime} and #{params.endCollectTime} and begin_time = #{beginTime} and end_time = #{endTime} @@ -116,9 +116,9 @@ where report_point_water.objid = #{objid} select ert.monitor_id, ert.monitor_name, ert.pointTime, sum(if(ert.expend is null, 0, ert.expend)) expend from ( - select rpd.monitor_id, m.monitor_name, left(rpd.begin_time, 10) pointTime, rpd.expend + select rpd.monitor_id, m.monitor_name, left(CONVERT(VARCHAR(17), rpd.begin_time, 120), 10) pointTime, rpd.expend from report_point_water rpd left join base_monitor_info m on m.monitor_id = rpd.monitor_id @@ -158,7 +158,7 @@ and rpd.begin_time between #{startTime} and #{endTime} - and left(rpd.begin_time, 10) between #{startDay} and #{endDay} + and left(CONVERT(VARCHAR(17), rpd.begin_time, 120), 10) between #{startDay} and #{endDay} ) ert @@ -168,21 +168,21 @@ @@ -207,8 +228,8 @@ where end_value>= #{quality} and #{quality}>=start_value and del_flag = '0' and check_type = #{checkType} - + select check_status from qc_check_task where check_type = #{checkType} and order_no= #{orderNo} and income_batch_no = #{incomeBatchNo} @@ -385,6 +406,22 @@ ) + + insert into base_product( + product_code,product_desc_zh,product_group,product_group_name, + meins,product_model,umrez,umren,mvgr5, + gross_weight,volume + ,create_by,create_time + ) values + + ( + #{item.productCode},#{item.productDescZh},#{item.productGroup},#{item.productGroupName}, + #{item.meins},#{item.productModel},#{item.umrez},#{item.umren},#{item.mvgr5}, + #{item.grossWeight},#{item.volume}, + 'oa',GETDATE() + ) + + + diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProLine.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProLine.java index 308f223e3..170037ae1 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProLine.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProLine.java @@ -9,6 +9,15 @@ public class ProLine { private Long efficiency; private String dh; private String factoryDh; + private String umrez; + + public String getUmrez() { + return umrez; + } + + public void setUmrez(String umrez) { + this.umrez = umrez; + } public String getFactoryDh() { return factoryDh; diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderMapper.java index a326aef0a..5e3c4da3d 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderMapper.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderMapper.java @@ -252,4 +252,6 @@ public interface ProOrderMapper { int updateAutoSplitWork(String orderCode); int updateAutoSplitOrder(String orderCode); + + void updateAutoSplitOrderO2(String orderCode); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java index b1f2380e6..af69dc4dc 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java @@ -460,6 +460,7 @@ public class ProOrderServiceImpl implements IProOrderService { /**pro_order**/ int s = proOrderMapper.updateAutoSplitOrder(proOrder.getOrderCode()); + proOrderMapper.updateAutoSplitOrderO2(proOrder.getOrderCode()); logger.info("s:"+s); return R.ok(); } @@ -1411,13 +1412,11 @@ public class ProOrderServiceImpl implements IProOrderService { for(int wm=0;wm + + + update po + set po.quantity_split = pow.quantity_split + from ( + select order_code,sum(quantity_split) quantity_split from pro_order_workorder + where del_flag= '0' and belong_work_order like concat(#{orderCode},'-%') + group by order_code + ) pow + left join pro_order po on po.order_code = pow.order_code + where po.del_flag= '0' + + + update pro_order + set status = (case when quantity = quantity_split then 'o2' else 'o1' end) + where del_flag= '0' and order_code in( + select order_code from pro_order_workorder + where del_flag= '0' and belong_work_order like concat(#{orderCode},'-%') + ) diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index 8b8c9b45c..e91bf44ec 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -132,8 +132,9 @@ and pow.prod_type = #{prodType} and pow.factory_code = #{factoryCode} and pow.end_flag = #{endFlag} - and CONVERT(varchar(10),pow.product_date, 120) >= - '${productDateStart}' + and CONVERT(varchar(10),pow.product_date, 120) >= '${productDateStart}' + + and pow.prod_line_code like concat('%', #{prodLineCode},'%') and '${productDateEnd}' >= CONVERT(varchar(10),pow.product_date, 120) and pow.parent_order = #{parentOrder} @@ -651,11 +652,13 @@ + + diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml index e1e48ab37..403088fa0 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml @@ -379,7 +379,7 @@ select '','','', qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit, - qct.supplier_code, qct.supplier_name, qct.income_time,'','', + qct.supplier_code, qct.supplier_name,CONVERT(varchar(10), qct.income_time, 120) income_time,'','', null,'', qct.check_type,'巡检检验' check_name,CONVERT(varchar(10),qct.create_time, 120) createTimeStr, qct.confirm,qct.confirm_man_name from qc_check_task qct @@ -409,7 +409,7 @@ and qct.check_type = 'checkTypeSCXJ' GROUP BY qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit, - qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_type,CONVERT(varchar(10),qct.create_time, 120), + qct.supplier_code, qct.supplier_name,CONVERT(varchar(10), qct.income_time, 120), qct.check_type,CONVERT(varchar(10),qct.create_time, 120), qct.confirm,qct.confirm_man_name ) t left join pro_order_workorder pow on pow.workorder_code = t.order_no diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml index 9d49b5ecd..eed072475 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml @@ -56,6 +56,7 @@ group by qct.supplier_code,qct.supplier_name select qctd.record_id recordId, qctd.project_id projectId, + qctd.record_id detailId, qctd.status, qctd.remark, CONVERT(VARCHAR(5),qctd.create_time, 108), @@ -176,12 +233,12 @@ left join qc_check_task_detail qctd on qct.record_id = qctd.belong_to where qct.order_no = #{orderNo} and qct.check_type = 'checkTypeSCXJ' and qct.check_status = '2' order by qctd.create_time - + diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java index 598501d9d..dd59c69da 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java @@ -155,8 +155,8 @@ public class SapItemSyncImpl implements SapItemSyncService { String MVGR3_NM = maraTable.getString("MVGR3_NM"); String MVGR4 = maraTable.getString("MVGR4"); String MVGR4_NM = maraTable.getString("MVGR4_NM"); - String MVGR5 = maraTable.getString("MVGR5"); - String MVGR5_NM = maraTable.getString("MVGR5_NM"); +// String MVGR5 = maraTable.getString("MVGR5");//标准占用 +// String MVGR5_NM = maraTable.getString("MVGR5_NM");//批次最大数量占用 String LAEDA = maraTable.getString("LAEDA"); String ERSDA = maraTable.getString("LAEDA"); log.info(i+"物料基础数据同步数据输出----" + diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java index 40699b084..97db642e6 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java @@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse; import com.op.system.api.domain.wms.wmsReportWork; +import com.op.wms.domain.WmsProductProductionRecords; import com.op.wms.domain.WmsProductPut; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; @@ -136,6 +137,11 @@ public class WmsProductPutController extends BaseController { String rlist = wmsProductPutService.addReportListSap(mesReportWork); return AjaxResult.success(rlist); } - - + //查询--成品生产记录 + @GetMapping("/selectProductProductionRecords") + public TableDataInfo selectProductProductionRecords(WmsProductProductionRecords wmsProductProductionRecords) { + startPage(); + List result= wmsProductPutService.selectProductProductionRecords(wmsProductProductionRecords); + return getDataTable(result); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java index 27fee1125..1751ad7d7 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java @@ -631,9 +631,15 @@ public class WmsToWCSmissionController { //保存--成品生产记录 @PostMapping("/finishedProductProductionRecords") public AjaxResult finishedProductProductionRecords(@RequestBody ProOrderWorkorder proOrderWorkorder) { - List list = wmsProductPutService.listProOrderWorkorder(proOrderWorkorder); - return success(list); + Integer result= wmsProductPutService.finishedProductProductionRecords(proOrderWorkorder); + return success(result); } +// //查询--成品生产记录 +// @PostMapping("/selectProductProductionRecords") +// public AjaxResult selectProductProductionRecords(@RequestBody WmsProductProductionRecords wmsProductProductionRecords) { +// List result= wmsProductPutService.selectProductProductionRecords(wmsProductProductionRecords); +// return success(result); +// } /** * 成品自动码垛完以后，RGV 接驳要入库的托盘，扫描 RFID 号，请求 WMS 获取入库托盘信息。 * 触发时机：扫描 RFID 编码，进行入库 diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java index 3ce336b19..2a656afe1 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java @@ -352,6 +352,15 @@ public class BaseProduct extends BaseEntity { @Excel(name = "报工汇率") private BigDecimal reportRate; private String mvgr5Nm; + private String warehouseCycle; + + public String getWarehouseCycle() { + return warehouseCycle; + } + + public void setWarehouseCycle(String warehouseCycle) { + this.warehouseCycle = warehouseCycle; + } public String getMvgr5Nm() { return mvgr5Nm; diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProductAttached.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProductAttached.java index 2f021ecb1..1e4882764 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProductAttached.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProductAttached.java @@ -122,6 +122,15 @@ public class BaseProductAttached extends BaseEntity { */ @Excel(name = "其它") private String other; + private String warehouseCycle; + + public String getWarehouseCycle() { + return warehouseCycle; + } + + public void setWarehouseCycle(String warehouseCycle) { + this.warehouseCycle = warehouseCycle; + } public void setId(String id) { this.id = id; diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/ProOrderWorkorder.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/ProOrderWorkorder.java index 66f677242..06478d045 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/ProOrderWorkorder.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/ProOrderWorkorder.java @@ -113,7 +113,11 @@ public class ProOrderWorkorder extends TreeEntity { */ @Excel(name = "产线编码") private String prodLineCode; - + /** + * 产线编码 + */ + @Excel(name = "产线名称") + private String prodLineName; /** * 工单生产日期 */ @@ -179,6 +183,24 @@ public class ProOrderWorkorder extends TreeEntity { */ @Excel(name = "产品类型") private String prodType; + @Excel(name = "托盘") + private String sn; + + public String getProdLineName() { + return prodLineName; + } + + public void setProdLineName(String prodLineName) { + this.prodLineName = prodLineName; + } + + public String getSn() { + return sn; + } + + public void setSn(String sn) { + this.sn = sn; + } /** * 是否为底层节点 1是 0不是 @@ -186,6 +208,16 @@ public class ProOrderWorkorder extends TreeEntity { @Excel(name = "是否为底层节点") private Integer endFlag; + private String quantity; + + public String getQuantity() { + return quantity; + } + + public void setQuantity(String quantity) { + this.quantity = quantity; + } + public Integer getEndFlag() { return endFlag; } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductProductionRecords.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductProductionRecords.java new file mode 100644 index 000000000..c91f73e04 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductProductionRecords.java @@ -0,0 +1,258 @@ +package com.op.wms.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + + +import java.util.Date; + +public class WmsProductProductionRecords extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + + private String siteCode; + /** + * 生产工单号 + */ + @Excel(name = "生产工单号") + private String productOrder; + + /** + * 产品名称 + */ + @Excel(name = "产品名称") + private String productName; + + /** + * 产品编码 + */ + @Excel(name = "产品编码") + private String productCode; + + /** + * 仓库编码 + */ + @Excel(name = "仓库编码") + private String whCode; + + /** + * 库区编码 + */ + @Excel(name = "库区编码") + private String waCode; + + /** + * 库位编码 + */ + @Excel(name = "库位编码") + private String wlCode; + + /** + * 托盘号 + */ + @Excel(name = "托盘号") + private String sn; + + /** + * 箱数 + */ + @Excel(name = "数量") + private String quantity; + + /** + * 预留字段1 + */ + @Excel(name = "预留字段1") + private String userDefined1; + + /** + * 预留字段2 + */ + @Excel(name = "预留字段2") + private String userDefined2; + + /** + * 预留字段3 + */ + @Excel(name = "预留字段3") + private String userDefined3; + + /** + * 预留字段4 + */ + @Excel(name = "预留字段4") + private String userDefined4; + + /** + * 预留字段5 + */ + @Excel(name = "预留字段5") + private String userDefined5; + @Excel(name = "批次") + private String batchCode; + @Excel(name = "产线名称") + private String lineName; + @Excel(name = "产线编号") + private String lineCode; + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "日期") + private Date productDate; + + public String getSiteCode() { + return siteCode; + } + + public void setSiteCode(String siteCode) { + this.siteCode = siteCode; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getProductOrder() { + return productOrder; + } + + public void setProductOrder(String productOrder) { + this.productOrder = productOrder; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public String getProductCode() { + return productCode; + } + + public void setProductCode(String productCode) { + this.productCode = productCode; + } + + public String getWhCode() { + return whCode; + } + + public void setWhCode(String whCode) { + this.whCode = whCode; + } + + public String getWaCode() { + return waCode; + } + + public void setWaCode(String waCode) { + this.waCode = waCode; + } + + public String getWlCode() { + return wlCode; + } + + public void setWlCode(String wlCode) { + this.wlCode = wlCode; + } + + public String getSn() { + return sn; + } + + public void setSn(String sn) { + this.sn = sn; + } + + public String getQuantity() { + return quantity; + } + + public void setQuantity(String quantity) { + this.quantity = quantity; + } + + public String getUserDefined1() { + return userDefined1; + } + + public void setUserDefined1(String userDefined1) { + this.userDefined1 = userDefined1; + } + + public String getUserDefined2() { + return userDefined2; + } + + public void setUserDefined2(String userDefined2) { + this.userDefined2 = userDefined2; + } + + public String getUserDefined3() { + return userDefined3; + } + + public void setUserDefined3(String userDefined3) { + this.userDefined3 = userDefined3; + } + + public String getUserDefined4() { + return userDefined4; + } + + public void setUserDefined4(String userDefined4) { + this.userDefined4 = userDefined4; + } + + public String getUserDefined5() { + return userDefined5; + } + + public void setUserDefined5(String userDefined5) { + this.userDefined5 = userDefined5; + } + + public String getBatchCode() { + return batchCode; + } + + public void setBatchCode(String batchCode) { + this.batchCode = batchCode; + } + + public String getLineName() { + return lineName; + } + + public void setLineName(String lineName) { + this.lineName = lineName; + } + + public String getLineCode() { + return lineCode; + } + + public void setLineCode(String lineCode) { + this.lineCode = lineCode; + } + + public Date getProductDate() { + return productDate; + } + + public void setProductDate(Date productDate) { + this.productDate = productDate; + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutRecordsMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutRecordsMapper.java index 4189eade4..6d9eb8ae0 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutRecordsMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutRecordsMapper.java @@ -2,6 +2,7 @@ package com.op.wms.mapper; import java.util.List; +import com.op.wms.domain.WmsProductProductionRecords; import com.op.wms.domain.WmsProductPutRecords; /** @@ -58,4 +59,8 @@ public interface WmsProductPutRecordsMapper { * @return 结果 */ public int deleteWmsProductPutRecordsByIds(String[] ids); + + Integer insertProductProductionRecord(WmsProductProductionRecords wmsProductProductionRecords); + + List selectProductProductionRecords(WmsProductProductionRecords wmsProductProductionRecords); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java index 114b75f04..6535ef551 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java @@ -134,4 +134,8 @@ public interface IWmsProductPutService { List selectBaseEquipmentList(BaseEquipment baseEquipment); List listProOrderWorkorder(ProOrderWorkorder proOrderWorkorder); + + Integer finishedProductProductionRecords(ProOrderWorkorder proOrderWorkorder); + + List selectProductProductionRecords(WmsProductProductionRecords wmsProductProductionRecords); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index 1c65ab2f1..dcfc7c2ca 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -805,7 +805,11 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { order.setProcureCode(sapPurchaseOrderQuery1.get("orderNum")); order.setSiteCode(sapPurchaseOrderQuery1.get("werks")); //order.setUserDefined3(sapPurchaseOrderQuery1.get("ebelp"));//批次 - order.setMaterialCode(sapPurchaseOrderQuery1.get("matnr")); + String materialCode = sapPurchaseOrderQuery1.get("matnr"); + materialCode = "0000000" + materialCode; + order.setMaterialCode(materialCode); +// order.setMaterialCode(sapPurchaseOrderQuery1.get("matnr")); +// order.setMaterialCode("0000000"+order.getMaterialCode()); order.setMaterialDesc(sapPurchaseOrderQuery1.get("matnrName")); order.setActive("1"); List orderList = odsProcureOrderMapper.selectOdsProcureOrderList(order); diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index b81c59635..7db9a07a6 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -997,6 +997,36 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { return workorderList; } + @Override + public Integer finishedProductProductionRecords(ProOrderWorkorder proOrderWorkorder) { + DynamicDataSourceContextHolder.push("ds_" + proOrderWorkorder.getFactoryCode()); + WmsProductProductionRecords wmsProductProductionRecords=new WmsProductProductionRecords(); + wmsProductProductionRecords.setSiteCode(proOrderWorkorder.getFactoryCode()); + wmsProductProductionRecords.setId(IdUtils.fastSimpleUUID()); + wmsProductProductionRecords.setSn(proOrderWorkorder.getSn()); + wmsProductProductionRecords.setQuantity(proOrderWorkorder.getQuantity()); + wmsProductProductionRecords.setBatchCode(proOrderWorkorder.getBatchCode()); + wmsProductProductionRecords.setProductOrder(proOrderWorkorder.getWorkorderCodeSap()); + wmsProductProductionRecords.setProductCode(proOrderWorkorder.getProductCode()); + wmsProductProductionRecords.setProductName(proOrderWorkorder.getProductName()); + wmsProductProductionRecords.setProductDate(new Date()); + wmsProductProductionRecords.setLineName(proOrderWorkorder.getProdLineName()); + wmsProductProductionRecords.setLineCode(proOrderWorkorder.getProdLineCode()); + wmsProductProductionRecords.setCreateBy(proOrderWorkorder.getCreateBy()); + wmsProductProductionRecords.setCreateTime(new Date()); + Integer result= wmsProductPutRecordsMapper.insertProductProductionRecord(wmsProductProductionRecords); + return result; + } + + @Override + @DS("#header.poolName") + public List selectProductProductionRecords(WmsProductProductionRecords wmsProductProductionRecords) { + // DynamicDataSourceContextHolder.push("ds_" + wmsProductProductionRecords.getSiteCode()); + + List records= wmsProductPutRecordsMapper.selectProductProductionRecords(wmsProductProductionRecords); + return records; + } + @Override public List FinishedProductSalesReturn(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { DynamicDataSourceContextHolder.push("ds_" + wmsRuturnPutEmbryo.getFactoryCode()); diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml index 81ecda8b0..cdbd24949 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml @@ -86,6 +86,7 @@ pc, iei, man_standar, + warehouse_cycle, spray_way, blank_diameter, blank_no, @@ -106,6 +107,7 @@ #{pc}, #{iei}, #{manStandar}, + #{warehouseCycle}, #{sprayWay}, #{blankDiameter}, #{blankNo}, @@ -149,7 +151,8 @@ update base_product_attached set iei = #{iei}, - man_standar = #{manStandar} + man_standar = #{manStandar}, + warehouse_cycle = #{warehouseCycle} where id = #{id} diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml index 901d89836..bd8b298f1 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml @@ -67,6 +67,8 @@ + + @@ -183,7 +185,7 @@ bpa.support_no, bpa.pvc, bpa.support_plate, - bpa.other + bpa.other,bpa.warehouse_cycle from base_product bp left join base_product_attached bpa on bpa.product_code = right(bp.product_code,11) where product_id = #{productId} diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml index a2ccd8c4a..6a6f837bd 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml @@ -48,7 +48,8 @@ and Site_code = #{siteCode} and Procure_Code = #{procureCode} - and Material_Code = #{materialCode} + and Material_Code like concat('%', #{materialCode}, + '%') and Material_Desc = #{materialDesc} and Plan_Date = #{planDate} and Plan_Number = #{planNumber} diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutRecordsMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutRecordsMapper.xml index 35e85c6b1..c1791b424 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutRecordsMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutRecordsMapper.xml @@ -139,4 +139,106 @@ #{id} + + insert into wms_product_production_records + + id, + product_order, + product_name, + product_code, + wh_code, + wa_code, + wl_code, + sn, + + user_defined1, + user_defined2, + user_defined3, + user_defined4, + user_defined5, + create_by, + create_time, + update_by, + update_time, + batch_code, + quantity, + lineName, + lineCode, + product_date, + siteCode, + + + #{id}, + #{productOrder}, + #{productName}, + #{productCode}, + #{whCode}, + #{waCode}, + #{wlCode}, + #{sn}, + + #{userDefined1}, + #{userDefined2}, + #{userDefined3}, + #{userDefined4}, + #{userDefined5}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{batchCode}, + #{quantity}, + #{lineName}, + #{lineCode}, + #{productDate}, + #{siteCode}, + + +