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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangzq
2024-12-09 23:27:17 +08:00
parent 9a35f86b2a 23f2a8927f
commit b7d0ba5ab7
6 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/controller/BmMaterialController.java
View File

@@ -59,14 +59,15 @@ public class BmMaterialController {
@PostMapping("/updateMaterialInfo") @PostMapping("/updateMaterialInfo")
public ResponseEntity<Object> updateMaterialInfo(@Validated @RequestBody MdMeMaterialbase dto) { public ResponseEntity<Object> updateMaterialInfo(@Validated @RequestBody MdMeMaterialbase dto) {
JSONObject result = new JSONObject();
if (BigDecimal.ZERO.compareTo(dto.getSingle_weight()) == 0 || StringUtils.isBlank(dto.getMaterial_id())) { if (BigDecimal.ZERO.compareTo(dto.getSingle_weight()) == 0 || StringUtils.isBlank(dto.getMaterial_id())) {
result.put("code", "400");
throw new BadRequestException("物料信息有误，请检查!"); throw new BadRequestException("物料信息有误，请检查!");
} }
LambdaUpdateWrapper<MdMeMaterialbase> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<MdMeMaterialbase> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(MdMeMaterialbase::getNearby_weight, dto.getSingle_weight()); updateWrapper.set(MdMeMaterialbase::getNearby_weight, dto.getSingle_weight());
updateWrapper.eq(MdMeMaterialbase::getMaterial_id, dto.getMaterial_id()); updateWrapper.eq(MdMeMaterialbase::getMaterial_id, dto.getMaterial_id());
materialService.update(updateWrapper); materialService.update(updateWrapper);
JSONObject result = new JSONObject();
result.put("code", "200"); result.put("code", "200");
return new ResponseEntity<>(result, HttpStatus.OK); return new ResponseEntity<>(result, HttpStatus.OK);
} }

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/dao/TaskInfo.java
View File

@@ -34,7 +34,7 @@ public class TaskInfo {
//理论数量 //理论数量
private BigDecimal theory_qty; private BigDecimal theory_qty;
//称重 //称重
private BigDecimal actual_weight=BigDecimal.ZERO; private BigDecimal actual_weight;
//剩余数量 //剩余数量
private BigDecimal remaining_qty; private BigDecimal remaining_qty;
private String form_data; private String form_data;

22
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/impl/CockpitServiceImpl.java
View File

@@ -317,7 +317,7 @@ public class CockpitServiceImpl implements CockpitService {
} }
} }
BigDecimal theoryQty = BigDecimal.ZERO; BigDecimal theoryQty = BigDecimal.ZERO;
BigDecimal actual_weight = BigDecimal.ZERO; BigDecimal actual_weight = null;
try { try {
String code1 = code; String code1 = code;
if ("1308".equals(code)) { if ("1308".equals(code)) {
@@ -350,16 +350,18 @@ public class CockpitServiceImpl implements CockpitService {
} }
r.setActual_weight(actual_weight); r.setActual_weight(actual_weight);
r.setActual_weight(r.getActual_weight().subtract(r.getVehicle_weight()).max(BigDecimal.ZERO).setScale(0, RoundingMode.DOWN)); r.setActual_weight(r.getActual_weight().subtract(r.getVehicle_weight()).max(BigDecimal.ZERO).setScale(0, RoundingMode.DOWN));
//根据称重信息计算理论数量 if (r.getActual_weight() != null && r.getSingle_weight() != null) {
if (r.getActual_weight().compareTo(BigDecimal.ZERO) > 0&&r.getSingle_weight().compareTo(BigDecimal.ZERO)> 0) { //根据称重信息计算理论数量
//计算理论重量：称重-载具重量/单重 = 理论数量，理论数量！=需出数量：称重异常 if (r.getActual_weight().compareTo(BigDecimal.ZERO) > 0 && r.getSingle_weight().compareTo(BigDecimal.ZERO) > 0) {
theoryQty = r.getActual_weight().divide(r.getSingle_weight(), 0, RoundingMode.DOWN); //计算理论重量：称重-载具重量/单重 = 理论数量，理论数量！=需出数量：称重异常
r.setActual_weight(r.getActual_weight().setScale(2, RoundingMode.DOWN)); theoryQty = r.getActual_weight().divide(r.getSingle_weight(), 0, RoundingMode.DOWN);
r.setActual_weight(r.getActual_weight().setScale(2, RoundingMode.DOWN));
}
r.setTheory_qty(theoryQty);
//计算剩余数量
BigDecimal remaining_qty = r.getQty().subtract(theoryQty).max(BigDecimal.ZERO).setScale(0, RoundingMode.DOWN);
r.setRemaining_qty(remaining_qty);
} }
r.setTheory_qty(theoryQty);
//计算剩余数量
BigDecimal remaining_qty = r.getQty().subtract(theoryQty).max(BigDecimal.ZERO).setScale(0, RoundingMode.DOWN);
r.setRemaining_qty(remaining_qty);
//单重 //单重
r.setSingle_weight(r.getSingle_weight().setScale(2, RoundingMode.DOWN)); r.setSingle_weight(r.getSingle_weight().setScale(2, RoundingMode.DOWN));
//需出数量 //需出数量

1
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/mapper/CockpitMapper.xml
View File

@@ -71,6 +71,7 @@
WHERE WHERE
JSON_UNQUOTE(JSON_EXTRACT(p.form_data, '$.point_code')) = #{code} JSON_UNQUOTE(JSON_EXTRACT(p.form_data, '$.point_code')) = #{code}
AND p.status = '10' AND p.status = '10'
AND m.material_id is NOT NULL
ORDER BY d.create_time ORDER BY d.create_time
LIMIT 2; LIMIT 2;
</select> </select>

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
View File

@@ -147,7 +147,7 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
return result; return result;
} catch (Exception ex) { } catch (Exception ex) {
// ex.printStackTrace(); // ex.printStackTrace();
// log.error("ERP单据解析异常：" + ex.getMessage()); log.error("ERP单据解析异常：" + ex.getMessage());
// throw new BadRequestException(ex.getMessage()); // throw new BadRequestException(ex.getMessage());
return null; return null;
} }

13
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java
View File

@@ -71,9 +71,9 @@ public class SyncErpBillsScheduleService {
MDC.put("requestIp", "127.0.0.1"); MDC.put("requestIp", "127.0.0.1");
MDC.put("requestTime", DateUtil.now()); MDC.put("requestTime", DateUtil.now());
LuceneAppender.traceIdTL.set(BaseCode.intToChars(IdUtil.getLongId())); LuceneAppender.traceIdTL.set(BaseCode.intToChars(IdUtil.getLongId()));
// List<SyncFormMapping> list = syncFormMappingServiceImpl.list(new LambdaQueryWrapper<SyncFormMapping>().in(SyncFormMapping::getForm_type, "BD_MATERIAL")); //List<SyncFormMapping> list = syncFormMappingServiceImpl.list(new LambdaQueryWrapper<SyncFormMapping>().in(SyncFormMapping::getForm_type, "BD_MATERIAL"));
List<SyncFormMapping> list = syncFormMappingServiceImpl.list(new LambdaQueryWrapper<SyncFormMapping>().in(SyncFormMapping::getForm_type, "ka7c19edf9d4b4b39b8cc4a06802163b0","PRD_PPBOM","PRD_MO","SAL_SaleOrder","PUR_ReceiveBill","PUR_MRAPP")); List<SyncFormMapping> list = syncFormMappingServiceImpl.list(new LambdaQueryWrapper<SyncFormMapping>().in(SyncFormMapping::getForm_type, "ka7c19edf9d4b4b39b8cc4a06802163b0","PRD_PPBOM","PRD_MO","SAL_SaleOrder","PUR_ReceiveBill","PUR_MRAPP"));
// List<SyncFormMapping> list = syncFormMappingServiceImpl.list(new LambdaQueryWrapper<SyncFormMapping>().in(SyncFormMapping::getForm_type, "ka7c19edf9d4b4b39b8cc4a06802163b0","PRD_PPBOM","PRD_MO","SAL_SaleOrder","PUR_ReceiveBill","PUR_MRAPP")); //List<SyncFormMapping> list = syncFormMappingServiceImpl.list(new LambdaQueryWrapper<SyncFormMapping>().in(SyncFormMapping::getForm_type, "ka7c19edf9d4b4b39b8cc4a06802163b0","PRD_PPBOM","PRD_MO","SAL_SaleOrder","PUR_ReceiveBill","PUR_MRAPP"));
for (SyncFormMapping m : list) { for (SyncFormMapping m : list) {
JSONArray mappingJson = m.getMapping_json(); JSONArray mappingJson = m.getMapping_json();
String mappingString = JSON.toJSONString(mappingJson); String mappingString = JSON.toJSONString(mappingJson);
@@ -172,16 +172,15 @@ public class SyncErpBillsScheduleService {
if (materialCount != materials.size()) { if (materialCount != materials.size()) {
log.error("保存数据 [{}] 时出现异常: {}", JSON.toJSONString(formDataList), "物料信息不存在" + materials.toString()); log.error("保存数据 [{}] 时出现异常: {}", JSON.toJSONString(formDataList), "物料信息不存在" + materials.toString());
} }
for (String id : formDataList.stream().map(PmFormData::getId).collect(Collectors.toList())) { for (PmFormData formData : formDataList) {
if (exitFormDataList.contains(id)) { if (exitFormDataList.contains(formData.getId()+"$"+formData.getForm_type())) {
continue 外部; continue 外部;
} }
} formData.setId(formData.getId()+"$"+formData.getForm_type());
for (PmFormData formData : formDataList) {
formDataService.save(formData); formDataService.save(formData);
} }
} catch (Exception e) { } catch (Exception e) {
//log.error("解析数据 [{}] 时出现异常: {}", JSON.toJSONString(r), e.getMessage()); log.error("解析数据 [{}] 时ID重复: {}", JSON.toJSONString(r), e.getMessage());
} }
} }
} }