DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2025-12-16 14:13:51 +08:00
parent 770f78b1df 87feb77aae
commit 87b0cecbaf
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
View File

@@ -745,7 +745,11 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
// 3. 插入钢卷数据 // 3. 插入钢卷数据
WmsMaterialCoil add = BeanUtil.toBean(bo, WmsMaterialCoil.class); WmsMaterialCoil add = BeanUtil.toBean(bo, WmsMaterialCoil.class);
if(bo.getDataType() == 10){
add.setDataType(10);
}else {
add.setDataType(1); // 新增的钢卷默认为当前数据 add.setDataType(1); // 新增的钢卷默认为当前数据
}
validEntityBeforeSave(add); validEntityBeforeSave(add);
int rows = baseMapper.insert(add); int rows = baseMapper.insert(add);
if (rows <= 0) { if (rows <= 0) {

2
klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml
View File

@@ -153,6 +153,7 @@
LEFT JOIN wms_material_coil mc ON mc.coil_id = wcpa.coil_id AND mc.del_flag = 0 LEFT JOIN wms_material_coil mc ON mc.coil_id = wcpa.coil_id AND mc.del_flag = 0
WHERE wcpa.del_flag = 0 WHERE wcpa.del_flag = 0
AND wcpa.action_type = 401 AND wcpa.action_type = 401
AND wcpa.action_status = 2
<if test="startTime != null"> <if test="startTime != null">
AND wcpa.create_time &gt;= #{startTime} AND wcpa.create_time &gt;= #{startTime}
</if> </if>
@@ -185,6 +186,7 @@
LEFT JOIN wms_material_coil mc ON mc.coil_id = wcpa.coil_id AND mc.del_flag = 0 LEFT JOIN wms_material_coil mc ON mc.coil_id = wcpa.coil_id AND mc.del_flag = 0
WHERE wcpa.del_flag = 0 WHERE wcpa.del_flag = 0
AND wcpa.action_type = 401 AND wcpa.action_type = 401
AND wcpa.action_status = 2
<if test="startTime != null"> <if test="startTime != null">
AND wcpa.create_time &gt;= #{startTime} AND wcpa.create_time &gt;= #{startTime}
</if> </if>