diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java index dfd7d2053..9a2dec95f 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java @@ -125,4 +125,9 @@ public interface RemoteSapService { @PostMapping("/sap/removeDatasource") public R removeDatasource(@RequestBody DataSourcePropertyDTO dataSourceProperty); -} + /** + *来料暂收接口 + */ + @PostMapping("/sap/temporarilyCollected") + public R temporarilyCollected(@RequestBody(required = false) List mapList) ; + } diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java index eebdb0065..c7bc2477e 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java @@ -138,6 +138,11 @@ public class RemoteSapFallbackFactory implements FallbackFactory mapList) { + return R.fail("来料暂收过账失败" + throwable.getMessage()); + } + }; } } diff --git a/op-common/op-common-datascope/op-common-datascope.iml b/op-common/op-common-datascope/op-common-datascope.iml index 3df02a46b..dab4c8afe 100644 --- a/op-common/op-common-datascope/op-common-datascope.iml +++ b/op-common/op-common-datascope/op-common-datascope.iml @@ -21,6 +21,7 @@ + @@ -30,7 +31,7 @@ - + @@ -125,4 +126,4 @@ - \ No newline at end of file + diff --git a/op-common/op-common-log/op-common-log.iml b/op-common/op-common-log/op-common-log.iml index 3df02a46b..dab4c8afe 100644 --- a/op-common/op-common-log/op-common-log.iml +++ b/op-common/op-common-log/op-common-log.iml @@ -21,6 +21,7 @@ + @@ -30,7 +31,7 @@ - + @@ -125,4 +126,4 @@ - \ No newline at end of file + diff --git a/op-common/op-common-security/op-common-security.iml b/op-common/op-common-security/op-common-security.iml index 5f28b4a04..5422c64f1 100644 --- a/op-common/op-common-security/op-common-security.iml +++ b/op-common/op-common-security/op-common-security.iml @@ -21,6 +21,7 @@ + @@ -29,7 +30,7 @@ - + @@ -124,4 +125,4 @@ - \ No newline at end of file + diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index de9e6664d..68509b2ba 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -830,7 +830,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mrwc.warehouse_code warehouseCode from mes_report_work_consume mrwc left join pro_order_workorder pow on mrwc.workorder_code = pow.workorder_code - where mrwc.attr1 = '1' and mrwc.del_flag = '0' and mrwc.attr2 = '0' + where mrwc.attr1 = '1' and mrwc.del_flag = '0' and mrwc.attr2 = '0' and pow.del_flag = '0' and mrwc.parent_order = #{workorderCode} + insert into qc_check_task diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml index d72e0e313..a363ca2d9 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -314,7 +314,7 @@ income_batch_no = #{incomeBatchNo}, remark = #{remark}, reason = #{reason}, - attr3 = #{attr3}, + bz = #{bz}, check_result = #{checkResult}, update_by = #{updateBy}, update_time = #{updateTime} diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml index 57a272aff..e95c68323 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml @@ -319,7 +319,7 @@ from base_product bp left join qc_material_group qmg on qmg.group_code = bp.mvgr5 where bp.product_code like concat('%',#{materialCode},'%') - and bp.del_flag = '0' + and bp.del_flag = '0' and qmg.del_flag = '0' order by qmg.create_time desc select storage_id, wh_code, region_code, wa_code, storage_type, wl_code, material_code, material_desc, amount, storage_amount, occupy_amount, lpn, product_batch, receive_date, product_date, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, user_defined7, user_defined8, user_defined9, user_defined10, create_by, gmt_create, last_modified_by, gmt_modified, active_flag, factory_code, sap_factory_code, wl_name from wms_ods_mate_storage_news - where wh_code=#{whCode} and wl_code=#{wlCode} and material_code=#{materialCode} + where wh_code=#{whCode} and wl_code=#{wlCode} and wa_code=#{waCode} and material_code=#{materialCode} + SELECT + wh_code, + wl_code, + wa_code, + po_no, + material_code, + material_desc, + sn, + amount AS amount + FROM + wms_raw_order_in_sn + WHERE + user_defined3 = #{ID} + AND user_defined1 = '1' + AND active_flag = '1' + + + + insert into wms_logotype_table( + id, + logotype, + sn, + active_flag + ) + values + ( + #{id}, + #{logotype}, + #{sn}, + #{activeFlag} + ) +