Yangwl
/
lanju-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://1.13.177.47:3000/Yangwl/lanju-cloud

Browse Source
master
杨万里 2 weeks ago
parent b8d5150050 32e7943e2d
commit a05d4a11c9
15 changed files with 160 additions and 59 deletions
Show Stats Download Patch File Download Diff File

11
op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapBaseProduct.java
Unescape Escape View File

@ -176,6 +176,9 @@ public class SapBaseProduct extends BaseEntity {
@Excel(name = "基本计量单位转换分母") @Excel(name = "基本计量单位转换分母")
private BigDecimal umren; private BigDecimal umren;
/** 检验标准 **/
private String inspectionStandard;
public BigDecimal getUmrez() { public BigDecimal getUmrez() {
return umrez; return umrez;
@ -468,6 +471,14 @@ public class SapBaseProduct extends BaseEntity {
return appendPercent; return appendPercent;
} }
public String getInspectionStandard() {
return inspectionStandard;
}
public void setInspectionStandard(String inspectionStandard) {
this.inspectionStandard = inspectionStandard;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

11
op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItem.java
Unescape Escape View File

@ -135,6 +135,9 @@ public class EquCheckItem extends BaseEntity {
@Excel(name = "循环周期") @Excel(name = "循环周期")
private int itemLoop; private int itemLoop;
@Excel(name = "部门")
private String deptName;
public int getItemLoop() { public int getItemLoop() {
return itemLoop; return itemLoop;
} }
@ -351,6 +354,14 @@ public class EquCheckItem extends BaseEntity {
return updateBy; return updateBy;
} }
public String getDeptName() {
return deptName;
}
public void setDeptName(String deptName) {
this.deptName = deptName;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

70
op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml
Unescape Escape View File

@ -24,6 +24,7 @@
<result property="itemTools" column="item_tools"/> <result property="itemTools" column="item_tools"/>
<result property="itemLoop" column="item_loop"/> <result property="itemLoop" column="item_loop"/>
<result property="itemLoopType" column="item_loop_type"/> <result property="itemLoopType" column="item_loop_type"/>
<result property="deptName" column="dept_name"/>
</resultMap> </resultMap>
<sql id="selectEquCheckItemVo"> <sql id="selectEquCheckItemVo">
@ -31,33 +32,56 @@
</sql> </sql>
<select id="selectEquCheckItemList" parameterType="EquCheckItem" resultMap="EquCheckItemResult"> <select id="selectEquCheckItemList" parameterType="EquCheckItem" resultMap="EquCheckItemResult">
<include refid="selectEquCheckItemVo"/> SELECT
i.item_id,
i.item_code,
i.item_name,
i.item_method,
i.item_type,
i.item_type_name,
i.item_remark,
i.factory_code,
i.attr1,
i.attr2,
i.attr3,
i.del_flag,
i.create_time,
i.create_by,
i.update_time,
i.update_by,
i.item_tools,
i.item_loop,
i.item_loop_type,
d.dept_name
FROM equ_check_item i
LEFT JOIN lanju_op_cloud.dbo.sys_user u ON i.create_by = u.user_name
LEFT JOIN lanju_op_cloud.dbo.sys_dept d ON u.dept_id = d.dept_id
<where> <where>
<if test="itemCode != null and itemCode != ''">and item_code like concat('%', #{itemCode}, '%')</if> <if test="itemCode != null and itemCode != ''">and i.item_code like concat('%', #{itemCode}, '%')</if>
<if test="itemName != null and itemName != ''">and item_name like concat('%', #{itemName}, '%')</if> <if test="itemName != null and itemName != ''">and i.item_name like concat('%', #{itemName}, '%')</if>
<if test="itemMethod != null and itemMethod != ''">and item_method like concat('%', #{itemMethod}, '%') <if test="itemMethod != null and itemMethod != ''">and i.item_method like concat('%', #{itemMethod}, '%')
</if> </if>
<if test="itemType != null and itemType != ''">and item_type = #{itemType}</if> <if test="itemType != null and itemType != ''">and i.item_type = #{itemType}</if>
<if test="itemTypeName != null and itemTypeName != ''">and item_type_name like concat('%', #{itemTypeName}, <if test="itemTypeName != null and itemTypeName != ''">and i.item_type_name like concat('%', #{itemTypeName},
'%') '%')
</if> </if>
<if test="itemRemark != null and itemRemark != ''">and item_remark = #{itemRemark}</if> <if test="itemRemark != null and itemRemark != ''">and i.tem_remark = #{itemRemark}</if>
<if test="factoryCode != null and factoryCode != ''">and factory_code = #{factoryCode}</if> <if test="factoryCode != null and factoryCode != ''">and i.factory_code = #{factoryCode}</if>
<if test="attr1 != null and attr1 != ''">and attr1 = #{attr1}</if> <if test="attr1 != null and attr1 != ''">and i.attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''">and attr2 = #{attr2}</if> <if test="attr2 != null and attr2 != ''">and i.attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''">and attr3 = #{attr3}</if> <if test="attr3 != null and attr3 != ''">and i.attr3 = #{attr3}</if>
<if test="delFlag != null and delFlag != ''">and del_flag = #{delFlag}</if> <if test="delFlag != null and delFlag != ''">and i.del_flag = #{delFlag}</if>
<if test="itemLoop != null and itemLoop != ''">and item_loop = #{itemLoop}</if> <if test="itemLoop != null and itemLoop != ''">and i.item_loop = #{itemLoop}</if>
<if test="itemLoopType != null and itemLoopType != ''">and item_loop_type = #{itemLoopType}</if> <if test="itemLoopType != null and itemLoopType != ''">and i.item_loop_type = #{itemLoopType}</if>
<if test="itemTools != null and itemTools != ''">and item_tools like concat('%', #{itemTools}, '%')</if> <if test="itemTools != null and itemTools != ''">and i.item_tools like concat('%', #{itemTools}, '%')</if>
<if test="createTimeStart != null ">and CONVERT(date,create_time) >= #{createTimeStart}</if> <if test="createTimeStart != null ">and CONVERT(date,i.create_time) >= #{createTimeStart}</if>
<if test="createTimeEnd != null ">and #{createTimeEnd} >= CONVERT(date,create_time)</if> <if test="createTimeEnd != null ">and #{createTimeEnd} >= CONVERT(date,i.create_time)</if>
<if test="createBy != null and createBy != ''">and create_by like concat('%', #{createBy}, '%')</if> <if test="createBy != null and createBy != ''">and i.create_by like concat('%', #{createBy}, '%')</if>
<if test="updateTimeStart != null ">and CONVERT(date,update_time) >= #{updateTimeStart}</if> <if test="updateTimeStart != null ">and CONVERT(date,i.update_time) >= #{updateTimeStart}</if>
<if test="updateTimeEnd != null ">and #{updateTimeEnd} >= CONVERT(date,update_time)</if> <if test="updateTimeEnd != null ">and #{updateTimeEnd} >= CONVERT(date,i.update_time)</if>
<if test="updateBy != null and updateBy != ''">and update_by like concat('%', #{updateBy}, '%')</if> <if test="updateBy != null and updateBy != ''">and i.update_by like concat('%', #{updateBy}, '%')</if>
and del_flag = '0' and i.del_flag = '0'
ORDER BY create_time DESC ORDER BY i.create_time DESC
</where> </where>
</select> </select>

2
op-modules/op-energy/src/main/java/com/op/energy/record/service/impl/RecordDnbInstantServiceImpl.java
Unescape Escape View File

@ -325,7 +325,7 @@ public class RecordDnbInstantServiceImpl implements IRecordDnbInstantService {
for (RecordDnbInstant item : list) { for (RecordDnbInstant item : list) {
BaseMonitorInfo temp = new BaseMonitorInfo(); BaseMonitorInfo temp = new BaseMonitorInfo();
temp.setConnCode(item.getMonitorId()); temp.setAddressCode(item.getMonitorId());
List<BaseMonitorInfo> baseList = baseMonitorInfoMapper.selectBaseMonitorInfoList(temp); List<BaseMonitorInfo> baseList = baseMonitorInfoMapper.selectBaseMonitorInfoList(temp);
for (BaseMonitorInfo base : baseList) { for (BaseMonitorInfo base : baseList) {
item.setMonitorId(base.getMonitorId()); item.setMonitorId(base.getMonitorId());

6
op-modules/op-energy/src/main/resources/mapper/base/BaseMonitorInfo1Mapper.xml
Unescape Escape View File

@ -39,12 +39,13 @@
<result property="physicalCode" column="physical_code"/> <result property="physicalCode" column="physical_code"/>
<result property="addressCode" column="address_code"/> <result property="addressCode" column="address_code"/>
<result property="connCode" column="conn_code"/> <result property="connCode" column="conn_code"/>
<result property="electricityMeterType" column="electricity_meter_type"/>
</resultMap> </resultMap>
<sql id="selectBaseMonitorInfoVo"> <sql id="selectBaseMonitorInfoVo">
select objid, parent_id, monitor_id, monitor_name, monitor_addr, monitor_type, monitor_status, select objid, parent_id, monitor_id, monitor_name, monitor_addr, monitor_type, monitor_status,
collect_device_id, ancestors, grade, build_id, subentry_id, business_id, meter_type_id, collect_device_id, ancestors, grade, build_id, subentry_id, business_id, meter_type_id,
meter_id, correct_value, pt, ct, is_ammeter, is_key_monitor, is_circuit, dept_id, user_id, meter_id, correct_value, pt, ct, is_ammeter, is_key_monitor, is_circuit, dept_id, user_id, electricity_meter_type,
create_by, create_time, update_by, update_time, public_share_type,monitor_hierarchy,room_code,room_name,physical_code,address_code, conn_code from base_monitor_info create_by, create_time, update_by, update_time, public_share_type,monitor_hierarchy,room_code,room_name,physical_code,address_code, conn_code from base_monitor_info
</sql> </sql>
@ -150,6 +151,7 @@
<if test="physicalCode != null">physical_code,</if> <if test="physicalCode != null">physical_code,</if>
<if test="addressCode != null">address_code,</if> <if test="addressCode != null">address_code,</if>
<if test="connCode != null">conn_code,</if> <if test="connCode != null">conn_code,</if>
<if test="electricityMeterType != null ">electricity_meter_type,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="parentId != null">#{parentId},</if> <if test="parentId != null">#{parentId},</if>
@ -185,6 +187,7 @@
<if test="physicalCode != null">#{physicalCode},</if> <if test="physicalCode != null">#{physicalCode},</if>
<if test="addressCode != null">#{addressCode},</if> <if test="addressCode != null">#{addressCode},</if>
<if test="connCode != null">#{connCode},</if> <if test="connCode != null">#{connCode},</if>
<if test="electricityMeterType != null ">#{electricityMeterType},</if>
</trim> </trim>
</insert> </insert>
@ -224,6 +227,7 @@
<if test="physicalCode != null">physical_code = #{physicalCode},</if> <if test="physicalCode != null">physical_code = #{physicalCode},</if>
<if test="addressCode != null">address_code = #{addressCode},</if> <if test="addressCode != null">address_code = #{addressCode},</if>
<if test="connCode != null">conn_code = #{connCode},</if> <if test="connCode != null">conn_code = #{connCode},</if>
<if test="electricityMeterType != null ">electricity_meter_type = #{electricityMeterType},</if>
</trim> </trim>
where objid = #{objid} where objid = #{objid}
</update> </update>

21
op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml
Unescape Escape View File

@ -514,20 +514,21 @@
SELECT objId, expend SELECT objId, expend
FROM ( FROM (
SELECT SELECT
objId, a.objId,
meter_value - ISNULL( LAG ( meter_value, 1 ) OVER ( PARTITION BY monitor_id ORDER BY record_time ), 0 ) AS expend, (a.meter_value - ISNULL( LAG ( a.meter_value, 1 ) OVER ( PARTITION BY a.monitor_id ORDER BY a.record_time ), 0 )) * ISNULL(b.ct, 1) AS expend,
ROW_NUMBER ( ) OVER ( ORDER BY record_time ) AS row_num ROW_NUMBER ( ) OVER ( ORDER BY a.record_time ) AS row_num
FROM report_point_dnb FROM report_point_dnb a
WHERE DATEPART( MINUTE, record_time ) = 0 LEFT JOIN base_monitor_info b ON a.monitor_id = b.monitor_id
AND DATEPART( SECOND, record_time ) = 0 WHERE DATEPART( MINUTE, a.record_time ) = 0
AND DATEPART( SECOND, a.record_time ) = 0
<if test="params.beginDate != null and params.beginDate != ''"> <if test="params.beginDate != null and params.beginDate != ''">
AND CONVERT ( VARCHAR, record_time, 23 ) >= #{params.beginDate} AND CONVERT ( VARCHAR, a.record_time, 23 ) >= #{params.beginDate}
AND CONVERT ( VARCHAR, record_time, 23 ) <![CDATA[ <= ]]> #{params.endDate} AND CONVERT ( VARCHAR, a.record_time, 23 ) <![CDATA[ <= ]]> #{params.endDate}
</if> </if>
<if test="params.beginDate == null || params.beginDate == ''"> <if test="params.beginDate == null || params.beginDate == ''">
AND CONVERT ( VARCHAR, record_time, 23 ) >= CONVERT(varchar, DATEADD(day, -2, GETDATE()), 23) AND CONVERT ( VARCHAR, a.record_time, 23 ) >= CONVERT(varchar, DATEADD(day, -2, GETDATE()), 23)
</if> </if>
AND monitor_id = #{params.monitorId} AND a.monitor_id = #{params.monitorId}
) n ) n
WHERE row_num != 1 WHERE row_num != 1
) b ON a.objid = b.objId ) b ON a.objid = b.objId

13
op-modules/op-job/src/main/java/com/op/job/config/DbIdentityEnum.java
Unescape Escape View File

@ -9,16 +9,21 @@ import java.util.stream.Stream;
@Getter @Getter
public enum DbIdentityEnum { public enum DbIdentityEnum {
// 小榄工厂 // 中山小榄工厂
DS_1000("ds_1000", buildHeader("ds_1000")), DS_1000("ds_1000", buildHeader("ds_1000")),
// 雅黛 // 中山雅黛工厂
DS_1010("ds_1010", buildHeader("ds_1010")), DS_1010("ds_1010", buildHeader("ds_1010")),
// 重庆工厂 // 重庆工厂
DS_1020("ds_1020", buildHeader("ds_1020")), DS_1020("ds_1020", buildHeader("ds_1020")),
// 江西工厂 // 江西榄菊工厂
DS_1030("ds_1030", buildHeader("ds_1030")), DS_1030("ds_1030", buildHeader("ds_1030")),
// 安徽工厂 // 安徽工厂
DS_1040("ds_1040", buildHeader("ds_1040")); DS_1040("ds_1040", buildHeader("ds_1040")),
// 江西康涤工厂
DS_1050("ds_1050", buildHeader("ds_1050")),
// 中山阜沙工厂
DS_1060("ds_1060", buildHeader("ds_1060")),
;
// 数据库唯一标识（服务端路由依据） // 数据库唯一标识（服务端路由依据）
private final String poolName; private final String poolName;

4
op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java
Unescape Escape View File

@ -1790,7 +1790,9 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
count = count + Integer.parseInt(data.getAttr2()); count = count + Integer.parseInt(data.getAttr2());
} }
}else { }else {
map.put(data.getAttr1(), "0"); if (!map.containsKey(data.getAttr1())){
map.put(data.getAttr1(), "0");
}
} }
} }
map.put("count", Integer.toString(count)); map.put("count", Integer.toString(count));

1
op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml
Unescape Escape View File

@ -70,6 +70,7 @@
left join qc_check_type q on q.id = qct.check_type left join qc_check_type q on q.id = qct.check_type
left join pro_order_workorder pow on pow.workorder_code = qct.order_no and pow.del_flag = '0' left join pro_order_workorder pow on pow.workorder_code = qct.order_no and pow.del_flag = '0'
<where> <where>
qct.order_no is not null
<if test="checkNo != null and checkNo != ''">and qct.check_no = #{checkNo}</if> <if test="checkNo != null and checkNo != ''">and qct.check_no = #{checkNo}</if>
<if test="incomeBatchNo != null and incomeBatchNo != ''">and qct.income_batch_no = #{incomeBatchNo}</if> <if test="incomeBatchNo != null and incomeBatchNo != ''">and qct.income_batch_no = #{incomeBatchNo}</if>
<if test="orderNo != null and orderNo != ''">and qct.order_no = #{orderNo}</if> <if test="orderNo != null and orderNo != ''">and qct.order_no = #{orderNo}</if>

32
op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
Unescape Escape View File

@ -935,7 +935,7 @@
qct.material_code materialCode,qct.material_name materialName, qct.material_code materialCode,qct.material_name materialName,
bpa.cpk_type cpkType,sdd.dict_label cpkTypeName, bpa.cpk_type cpkType,sdd.dict_label cpkTypeName,
qct.order_no workorderCode,qct.income_batch_no batchNo,pow.workorder_code_sap workorderCodeSap, qct.order_no workorderCode,qct.income_batch_no batchNo,pow.workorder_code_sap workorderCodeSap,
qctd.rule_name ruleName, CONCAT(qpt.project_type_name, '-', qctd.rule_name) ruleName,
qctd.actual_value actualValue qctd.actual_value actualValue
from qc_check_task qct from qc_check_task qct
left join qc_check_task_detail qctd on qct.record_id = qctd.belong_to left join qc_check_task_detail qctd on qct.record_id = qctd.belong_to
@ -943,9 +943,11 @@
left join base_product_attached bpa on concat('0000000',bpa.product_code) = qct.material_code left join base_product_attached bpa on concat('0000000',bpa.product_code) = qct.material_code
left join pro_order_workorder pow on pow.workorder_code = qct.order_no left join pro_order_workorder pow on pow.workorder_code = qct.order_no
left join lanju_op_cloud.dbo.sys_dict_data sdd on sdd.dict_value = bpa.cpk_type and sdd.dict_type= 'qms_category' left join lanju_op_cloud.dbo.sys_dict_data sdd on sdd.dict_value = bpa.cpk_type and sdd.dict_type= 'qms_category'
LEFT JOIN qc_check_project qcp ON qcp.id = qctd.project_id
LEFT JOIN qc_project_type qpt ON qpt.project_type_code = qcp.project_type
where qctd.project_id = #{projectId} and qct.check_type = #{checkType} where qctd.project_id = #{projectId} and qct.check_type = #{checkType}
and qctd.actual_value is not null and qctd.actual_value is not null
and qctd.del_flag = '0' and qct.del_flag = '0' and be.del_flag = '0' and pow.del_flag = '0' and qctd.del_flag = '0' and qct.del_flag = '0'
<if test="checkLoc != null ">and qct.check_loc = #{checkLoc}</if> <if test="checkLoc != null ">and qct.check_loc = #{checkLoc}</if>
<if test="cpkType != null ">and bpa.cpk_type = #{cpkType}</if> <if test="cpkType != null ">and bpa.cpk_type = #{cpkType}</if>
<if test="workorderCodeSap != null ">and pow.workorder_code_sap like concat('%',#{workorderCodeSap},'%')</if> <if test="workorderCodeSap != null ">and pow.workorder_code_sap like concat('%',#{workorderCodeSap},'%')</if>
@ -1416,7 +1418,7 @@
SELECT SELECT
ISNULL(tc.class_name,'其他') defectSubclass, ISNULL(tc.class_name,'其他') defectSubclass,
FORMAT ( qct.create_time, 'yyyy-MM-dd' ) attr1, FORMAT ( qct.create_time, 'yyyy-MM-dd' ) attr1,
SUM(td.noOk_quality) attr2, ISNULL( SUM ( td.noOk_quality ), 0 ) attr2,
SUM(qct.sample_quality) attr3 SUM(qct.sample_quality) attr3
FROM qc_check_task qct FROM qc_check_task qct
LEFT JOIN qc_check_task_defect td ON qct.record_id = td.belong_to LEFT JOIN qc_check_task_defect td ON qct.record_id = td.belong_to
@ -1427,17 +1429,23 @@
GROUP BY tc.class_name, FORMAT ( qct.create_time, 'yyyy-MM-dd' ) GROUP BY tc.class_name, FORMAT ( qct.create_time, 'yyyy-MM-dd' )
UNION ALL UNION ALL
SELECT SELECT
'合计' defectSubclass, '合计' AS defectSubclass,
FORMAT ( qct.create_time, 'yyyy-MM-dd' ) attr1, FORMAT(qct.create_time, 'yyyy-MM-dd') AS attr1,
SUM ( td.noOk_quality ) attr2, ISNULL(SUM(td.total_noOk), 0) AS attr2,
SUM ( qct.sample_quality ) attr3 SUM(qct.sample_quality) AS attr3
FROM qc_check_task qct FROM qc_check_task qct
LEFT JOIN qc_check_task_defect td ON qct.record_id = td.belong_to LEFT JOIN (
LEFT JOIN qc_defect_type_class tc ON td.class_id = tc.id SELECT belong_to,
WHERE qct.del_flag = '0' SUM(noOk_quality) AS total_noOk
AND FORMAT ( qct.create_time, 'yyyy-MM' ) = #{yearMonth} FROM qc_check_task_defect
GROUP BY belong_to
) td ON qct.record_id = td.belong_to
WHERE
qct.del_flag = '0'
AND FORMAT(qct.create_time, 'yyyy-MM') = #{yearMonth}
AND qct.order_type = 'bp' AND qct.order_type = 'bp'
GROUP BY FORMAT ( qct.create_time, 'yyyy-MM-dd' ) AND qct.order_no IS NULL
GROUP BY FORMAT(qct.create_time, 'yyyy-MM-dd')
</select> </select>
<select id="getBPDefectMothMapV2" resultType="com.op.quality.domain.QcCheckTaskDefect"> <select id="getBPDefectMothMapV2" resultType="com.op.quality.domain.QcCheckTaskDefect">

13
op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java
Unescape Escape View File

@ -161,6 +161,7 @@ public class SapItemSyncImpl implements SapItemSyncService {
String ZLONG = maraTable.getString("ZLONG"); String ZLONG = maraTable.getString("ZLONG");
String ZWIDE = maraTable.getString("ZWIDE"); String ZWIDE = maraTable.getString("ZWIDE");
String ZHIGH = maraTable.getString("ZHIGH"); String ZHIGH = maraTable.getString("ZHIGH");
String BISMT = maraTable.getString("BISMT");
log.info(i+"物料基础数据同步数据输出----" + log.info(i+"物料基础数据同步数据输出----" +
"工厂：" +WERKS+ "工厂：" +WERKS+
"物料号：" + MATNR + "物料号：" + MATNR +
@ -205,6 +206,7 @@ public class SapItemSyncImpl implements SapItemSyncService {
baseProduct.setNetWeight(NTGEW); baseProduct.setNetWeight(NTGEW);
baseProduct.setVolume(VOLUM); baseProduct.setVolume(VOLUM);
baseProduct.setMeins(MEINS); baseProduct.setMeins(MEINS);
baseProduct.setOldProductCode(BISMT);
baseProduct.setDelFlag("0"); baseProduct.setDelFlag("0");
baseProduct.setActiveFlag("1"); baseProduct.setActiveFlag("1");
baseProduct.setCreateBy(SecurityUtils.getUsername()); baseProduct.setCreateBy(SecurityUtils.getUsername());
@ -364,6 +366,17 @@ public class SapItemSyncImpl implements SapItemSyncService {
try { try {
// 验证是否存在这个物料 // 验证是否存在这个物料
SapBaseProduct u = sapBaseProductMapper.selectBaseProductByProductCode(sapBaseProduct); SapBaseProduct u = sapBaseProductMapper.selectBaseProductByProductCode(sapBaseProduct);
//存在旧物料
if (!StringUtils.isBlank(sapBaseProduct.getOldProductCode())){
SapBaseProduct query = new SapBaseProduct();
query.setProductCode(sapBaseProduct.getOldProductCode());
SapBaseProduct oldMaterial = sapBaseProductMapper.selectBaseProductByProductCode(query);
if (oldMaterial != null){
if (StringUtils.isNotBlank(oldMaterial.getInspectionStandard())){
sapBaseProduct.setInspectionStandard(oldMaterial.getInspectionStandard());
}
}
}
if (StringUtils.isNull(u)) { if (StringUtils.isNull(u)) {
BeanValidators.validateWithException(validator, sapBaseProduct); BeanValidators.validateWithException(validator, sapBaseProduct);
sapBaseProduct.setCreateBy("job"); sapBaseProduct.setCreateBy("job");

5
op-modules/op-sap/src/main/resources/mapper/sap/SapBaseProductMapper.xml
Unescape Escape View File

@ -53,7 +53,7 @@
</resultMap> </resultMap>
<sql id="selectBaseProductVo"> <sql id="selectBaseProductVo">
select product_id, product_code, product_desc_zh, product_model,product_desc_en, rule_code, old_product_code, parts_product_code, sku_barcode, length, width, height, gross_weight, net_weight, tare_weight, volume,meins, unit_price, product_group, product_group_name, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, create_by, create_time, update_by, update_time, factory_code, active_flag, sync_flag, primary_uom, del_flag, bstme, basic_order, conv_order, ausme, basic_issue, conv_issue, append_flag, append_percent from base_product select product_id, product_code, product_desc_zh, product_model,product_desc_en, rule_code, old_product_code, parts_product_code, sku_barcode, length, width, height, gross_weight, net_weight, tare_weight, volume,meins, unit_price, product_group, product_group_name, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, create_by, create_time, update_by, update_time, factory_code, active_flag, sync_flag, primary_uom, del_flag, bstme, basic_order, conv_order, ausme, basic_issue, conv_issue, append_flag, append_percent, mvgr5 inspectionStandard from base_product
</sql> </sql>
<select id="selectSBaseProductList" parameterType="com.op.system.api.domain.sap.SapBaseProduct" <select id="selectSBaseProductList" parameterType="com.op.system.api.domain.sap.SapBaseProduct"
@ -161,6 +161,7 @@
<if test="convIssue != null">conv_issue,</if> <if test="convIssue != null">conv_issue,</if>
<if test="appendFlag != null">append_flag,</if> <if test="appendFlag != null">append_flag,</if>
<if test="appendPercent != null">append_percent,</if> <if test="appendPercent != null">append_percent,</if>
<if test="inspectionStandard != null">mvgr5,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="productId != null">#{productId},</if> <if test="productId != null">#{productId},</if>
@ -208,6 +209,7 @@
<if test="convIssue != null">#{convIssue},</if> <if test="convIssue != null">#{convIssue},</if>
<if test="appendFlag != null">#{appendFlag},</if> <if test="appendFlag != null">#{appendFlag},</if>
<if test="appendPercent != null">#{appendPercent},</if> <if test="appendPercent != null">#{appendPercent},</if>
<if test="inspectionStandard != null">#{inspectionStandard},</if>
</trim> </trim>
</insert> </insert>
@ -258,6 +260,7 @@
<if test="convIssue != null">conv_issue = #{convIssue},</if> <if test="convIssue != null">conv_issue = #{convIssue},</if>
<if test="appendFlag != null">append_flag = #{appendFlag},</if> <if test="appendFlag != null">append_flag = #{appendFlag},</if>
<if test="appendPercent != null">append_percent = #{appendPercent},</if> <if test="appendPercent != null">append_percent = #{appendPercent},</if>
<if test="inspectionStandard != null">mvgr5 = #{inspectionStandard},</if>
</trim> </trim>
where product_id = #{productId} where product_id = #{productId}
</update> </update>

5
op-modules/op-wms/src/main/java/com/op/wms/domain/query/BatchProductionMaterialQuery.java
Unescape Escape View File

@ -68,5 +68,10 @@ public class BatchProductionMaterialQuery {
* **/ * **/
private String userDefined10; private String userDefined10;
/**
* ids
* **/
private List<String> ids;
} }

14
op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsRawMaterialOutServiceImpl.java
Unescape Escape View File

@ -89,14 +89,15 @@ public class WmsRawMaterialOutServiceImpl implements IWmsRawMaterialOutService {
public AjaxResult submitTransferMaterialList(OdsProcureOutOrder params) { public AjaxResult submitTransferMaterialList(OdsProcureOutOrder params) {
//更新出库单及新增出库明细 //更新出库单及新增出库明细
updateOdsProcureOutOrder(params); List<String> ids = updateOdsProcureOutOrder(params);
//获取已完成，但没有过账的转储物料 //获取已完成，但没有过账的转储物料
BatchProductionMaterialQuery query = new BatchProductionMaterialQuery(); BatchProductionMaterialQuery query = new BatchProductionMaterialQuery();
query.setUserDefined3("ZC"); query.setUserDefined3(params.getUserDefined3());
query.setOrderStatus("3"); query.setOrderStatus("3");
query.setActive("1"); query.setActive("1");
query.setUserDefined10("1"); query.setUserDefined10("1");
query.setIds(ids);
List<OdsProcureOutOrder> orderList = odsProcureOutOrderMapper.getBatchProductionMaterialList(query); List<OdsProcureOutOrder> orderList = odsProcureOutOrderMapper.getBatchProductionMaterialList(query);
if (orderList.isEmpty()){ if (orderList.isEmpty()){
@ -125,7 +126,7 @@ public class WmsRawMaterialOutServiceImpl implements IWmsRawMaterialOutService {
@DS("#header.poolName") @DS("#header.poolName")
public AjaxResult submitReverseMaterialList(OdsProcureOutOrder params) { public AjaxResult submitReverseMaterialList(OdsProcureOutOrder params) {
//更新出库单及新增出库明细 //更新出库单及新增出库明细
updateOdsProcureOutOrder(params); List<String> ids = updateOdsProcureOutOrder(params);
//获取已完成，但没有过账的反冲物料 //获取已完成，但没有过账的反冲物料
BatchProductionMaterialQuery query = new BatchProductionMaterialQuery(); BatchProductionMaterialQuery query = new BatchProductionMaterialQuery();
@ -133,6 +134,7 @@ public class WmsRawMaterialOutServiceImpl implements IWmsRawMaterialOutService {
query.setOrderStatus("3"); query.setOrderStatus("3");
query.setActive("1"); query.setActive("1");
query.setUserDefined10("1"); query.setUserDefined10("1");
query.setIds(ids);
List<OdsProcureOutOrder> orderList = odsProcureOutOrderMapper.getBatchProductionMaterialList(query); List<OdsProcureOutOrder> orderList = odsProcureOutOrderMapper.getBatchProductionMaterialList(query);
if (orderList.isEmpty()){ if (orderList.isEmpty()){
return AjaxResult.success(); return AjaxResult.success();
@ -155,11 +157,14 @@ public class WmsRawMaterialOutServiceImpl implements IWmsRawMaterialOutService {
} }
//更新出库单及出库明细 //更新出库单及出库明细
private void updateOdsProcureOutOrder(OdsProcureOutOrder params) { private List<String> updateOdsProcureOutOrder(OdsProcureOutOrder params) {
List<OdsProcureOutOrder> orderList = params.getOrderList(); List<OdsProcureOutOrder> orderList = params.getOrderList();
List<String> ids = new ArrayList<>();
//遍历列表 //遍历列表
for (OdsProcureOutOrder order : orderList) { for (OdsProcureOutOrder order : orderList) {
ids.add(order.getID());
//计划数量 //计划数量
BigDecimal planQty = order.getPlanNumber(); BigDecimal planQty = order.getPlanNumber();
//已出数量 //已出数量
@ -206,6 +211,7 @@ public class WmsRawMaterialOutServiceImpl implements IWmsRawMaterialOutService {
order.setUserDefined2(null); order.setUserDefined2(null);
odsProcureOutOrderMapper.insertWmsRawMissionOut(order); odsProcureOutOrderMapper.insertWmsRawMissionOut(order);
} }
return ids;
} }
//过账信息处理 //过账信息处理

11
op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
Unescape Escape View File

@ -1017,6 +1017,7 @@
<if test="enterpriseId != null and enterpriseId != ''"> and Enterprise_Id = #{enterpriseId}</if> <if test="enterpriseId != null and enterpriseId != ''"> and Enterprise_Id = #{enterpriseId}</if>
<if test="enterpriseCode != null and enterpriseCode != ''"> and Enterprise_Code = #{enterpriseCode}</if> <if test="enterpriseCode != null and enterpriseCode != ''"> and Enterprise_Code = #{enterpriseCode}</if>
</where> </where>
order by Material_Code
</select> </select>
<insert id="insertWmsOdsProcureOutOrder" parameterType="OdsProcureOutOrder"> <insert id="insertWmsOdsProcureOutOrder" parameterType="OdsProcureOutOrder">
@ -1189,7 +1190,7 @@
<if test="userDefined4 != null and userDefined4 != ''"> and User_Defined4 like concat('%', #{userDefined4}, '%') </if> <if test="userDefined4 != null and userDefined4 != ''"> and User_Defined4 like concat('%', #{userDefined4}, '%') </if>
<if test="Active != null and Active != ''"> and Active = #{Active}</if> <if test="Active != null and Active != ''"> and Active = #{Active}</if>
</where> </where>
ORDER BY Create_Date DESC ORDER BY FORMAT (Create_Date, 'yyyy-MM-dd' ) DESC, Produce_Code, Material_Code
</select> </select>
<select id="selectOdsProcureOutOrderListZCTW" parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult"> <select id="selectOdsProcureOutOrderListZCTW" parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
SELECT SELECT
@ -2233,8 +2234,14 @@
<if test="userDefined3 != null and userDefined3 != ''"> and User_Defined3 = #{userDefined3} </if> <if test="userDefined3 != null and userDefined3 != ''"> and User_Defined3 = #{userDefined3} </if>
<if test="userDefined6 != null and userDefined6 != ''"> and User_Defined6 = #{userDefined6} </if> <if test="userDefined6 != null and userDefined6 != ''"> and User_Defined6 = #{userDefined6} </if>
<if test="userDefined10 != null and userDefined10 != ''"> and User_Defined10 = #{userDefined10} </if> <if test="userDefined10 != null and userDefined10 != ''"> and User_Defined10 = #{userDefined10} </if>
<if test="ids != null">
and id in
<foreach collection="ids" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
</where> </where>
ORDER BY userDefined10, userDefined6, userDefined2 ORDER BY userDefined10, Material_Code
</select> </select>
<update id="batchUpdateWmsOdsProcureOutOrder" parameterType="com.op.wms.domain.OdsProcureOutOrder"> <update id="batchUpdateWmsOdsProcureOutOrder" parameterType="com.op.wms.domain.OdsProcureOutOrder">

Write Preview
Loading…
Cancel
Save