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

rev：1.出库分配逻辑修改，组盘页面批次下拉框修改

Browse Source
This commit is contained in:
liuxy
2025-12-26 14:50:31 +08:00
parent 499eaf4099
commit c057cffea9
9 changed files with 73 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
View File

@@ -98,6 +98,12 @@ public class GroupController {
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/getPcsn")
@Log("获取批次下拉框")
public ResponseEntity<Object> getPcsn() {
return new ResponseEntity<>(iMdPbGroupplateService.getPcsn(),HttpStatus.OK);
}
@PostMapping("/printDelete")
@Log("打印物料标签后删除")
public ResponseEntity<Object> printDelete(@RequestBody GroupPlate dto) {

3
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml
View File

@@ -133,6 +133,7 @@
late.quality_type,
late.quality_type AS old_quality_type,
late.bake_num,
late.is_return,
false AS edit,
(
CASE late.quality_type
@@ -304,7 +305,7 @@
late.device_code = #{device_code}
</if>
</where>
ORDER BY quality_day,late.produce_time,ex.canuse_qty
ORDER BY late.is_return DESC,late.produce_time,ex.canuse_qty
</select>
<select id="erpQueryIvt" resultType="com.alibaba.fastjson.JSONObject">

7
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java
View File

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.basedata_manage.service.dao.MdCsSupplierbase;
import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
import org.nl.wms.pda.util.PdaResponse;
import org.nl.wms.warehouse_management.service.dao.GroupPlate;
import org.springframework.web.multipart.MultipartFile;
@@ -104,4 +105,10 @@ public interface IMdPbGroupplateService extends IService<GroupPlate> {
* @param request post请求
*/
void importExcel(MultipartFile file, HttpServletRequest request);
/**
* 获取批次下拉框
* @return PdaResponse
*/
PdaResponse getPcsn();
}

5
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java
View File

@@ -134,4 +134,9 @@ public class GroupPlate implements Serializable {
* 机台编码
*/
private String device_code;
/**
* 是否退料
*/
private String is_return;
}

13
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java
View File

@@ -23,6 +23,8 @@ import org.nl.wms.basedata_manage.service.dao.MdCsSupplierbase;
import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
import org.nl.wms.basedata_manage.service.dao.MdPbMeasureunit;
import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo;
import org.nl.wms.pda.general_management.service.PdaInGroupBoxService;
import org.nl.wms.pda.util.PdaResponse;
import org.nl.wms.warehouse_management.enums.IOSConstant;
import org.nl.wms.warehouse_management.enums.IOSEnum;
import org.nl.wms.warehouse_management.service.IMdPbGroupplateService;
@@ -75,6 +77,12 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl<MdPbGroupplateMapper,
@Autowired
private IMdPbMeasureunitService iMdPbMeasureunitService;
/**
* 手持组盘服务
*/
@Autowired
private PdaInGroupBoxService pdaInGroupBoxService;
@Override
public IPage<JSONObject> queryAll(Map whereJson, PageQuery page) {
return this.baseMapper.queryAllByPage(new Page<>(page.getPage() + 1, page.getSize()),
@@ -194,4 +202,9 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl<MdPbGroupplateMapper,
throw new BadRequestException("导入失败!" + e.getMessage());
}
}
@Override
public PdaResponse getPcsn() {
return pdaInGroupBoxService.queryPcsn();
}
}

3
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java
View File

@@ -621,6 +621,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
//更新组盘记录表
groupPlateMapper.update(new GroupPlate(), new LambdaUpdateWrapper<>(GroupPlate.class)
.set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))
.set(ioStorInv.getBill_type().equals(IOSEnum.IN_BILL_TYPE.code("退料入库")),GroupPlate::getIs_return, IOSConstant.ONE)
.eq(GroupPlate::getPcsn, ioStorInvDis.getPcsn())
.eq(GroupPlate::getStoragevehicle_code, ioStorInvDis.getStoragevehicle_code())
.eq(GroupPlate::getMaterial_id, ioStorInvDis.getMaterial_id())
@@ -659,6 +660,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
if (ObjectUtil.isEmpty(ioStorInvDis)) {
throw new BadRequestException("未找到任务对应的分配明细");
}
IOStorInv ioStorInv = ioStorInvMapper.selectById(ioStorInvDis.getIostorinv_id());
// 完成当前分配明细
ioStorInvDisMapper.update(ioStorInvDis, new LambdaUpdateWrapper<>(IOStorInvDis.class)
@@ -692,6 +694,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
//更新组盘记录表
groupPlateMapper.update(new GroupPlate(), new LambdaUpdateWrapper<>(GroupPlate.class)
.set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))
.set(ioStorInv.getBill_type().equals(IOSEnum.IN_BILL_TYPE.code("退料入库")),GroupPlate::getIs_return, IOSConstant.ONE)
.eq(GroupPlate::getPcsn, ioStorInvDis.getPcsn())
.eq(GroupPlate::getStoragevehicle_code, ioStorInvDis.getStoragevehicle_code())
.eq(GroupPlate::getMaterial_id, ioStorInvDis.getMaterial_id())