root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev：成品入库优化

Browse Source
This commit is contained in:
liuxy
2024-05-29 16:23:45 +08:00
parent 098330e94f
commit 54c7167565
3 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvMapper.java
View File

@@ -1,6 +1,7 @@
package org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.mapper;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
@@ -27,4 +28,11 @@ public interface StIvtIostorinvMapper extends BaseMapper<StIvtIostorinv> {
* @return List<Map>
*/
List<Map> getPageQuery(@Param("query") Map query, @Param("pageQuery") Pageable pageQuery);
/**
* 查询木箱对应的单据
* @param whereJson： {package_box_sn： 木箱号}
* @return 、
*/
JSONObject queryBoxMst(JSONObject whereJson);
}

21
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvMapper.xml
View File

@@ -118,4 +118,25 @@
</select>
<select id="queryBoxMst" resultType="com.alibaba.fastjson.JSONObject">
SELECT DISTINCT
CONVERT(ios.iostorinv_id , CHAR ) AS iostorinv_id
FROM
ST_IVT_IOStorInv ios
LEFT JOIN st_ivt_iostorinvdis dis ON dis.iostorinv_id = ios.iostorinv_id
<where>
ios.is_delete = '0'
AND
ios.io_type = '0'
AND
ios.bill_status != '99'
<if test="package_box_sn != null and package_box_sn != ''">
and dis.box_no = #{package_box_sn}
</if>
</where>
</select>
</mapper>

21
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java
View File

@@ -16,6 +16,7 @@ import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvdtlServi
import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinv;
import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinvdis;
import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinvdtl;
import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.mapper.StIvtIostorinvMapper;
import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.InBussManageService;
import org.nl.common.utils.MapOf;
import org.nl.modules.common.exception.BadRequestException;
@@ -44,6 +45,9 @@ public class InBussManageServiceImpl implements InBussManageService {
@Autowired
private IStIvtIostorinvService iStIvtIostorinvService;
@Autowired
private StIvtIostorinvMapper stIvtIostorinvMapper;
@Autowired
private IStIvtIostorinvdtlService iStIvtIostorinvdtlService;
@@ -207,7 +211,7 @@ public class InBussManageServiceImpl implements InBussManageService {
List<String> pcsnList = Arrays.asList(material_barcode.split(","));
// 查询子卷包装关系
List<JSONObject> subList = subTab.query("container_name in ('"+String.join("','", pcsnList)+"') and status = '0'")
List<JSONObject> subList = subTab.query("container_name in ('"+String.join("','", pcsnList)+"') and status IN ( '0', '1')")
.getResultJSONArray(0).toJavaList(JSONObject.class);
if (ObjectUtil.isEmpty(subList)) {
@@ -250,8 +254,19 @@ public class InBussManageServiceImpl implements InBussManageService {
}
mst.put("tableData",tableData);
// 调用服务创建
String iostorinv_id = iStIvtIostorinvService.insertMst(mst);
// 判断是否已经生成过入库单
String package_box_sn = (String) tableData.get(0).get("package_box_sn");
JSONObject param = new JSONObject();
param.put("package_box_sn",package_box_sn);
JSONObject iosMst = stIvtIostorinvMapper.queryBoxMst(param);
String iostorinv_id;
if (ObjectUtil.isNotEmpty(iosMst)) {
iostorinv_id = iosMst.getString("iostorinv_id");
} else {
// 调用服务创建
iostorinv_id = iStIvtIostorinvService.insertMst(mst);
}
// 调用分配货位并下发
JSONObject jsonDiv = new JSONObject();