lyd/liaoninghexing
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 修复BUG

Browse Source
This commit is contained in:
liyongde
2024-06-12 17:44:52 +08:00
parent fd599b6acd
commit 6824cdf653
5 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/impl/MdBaseBrickInfoServiceImpl.java
View File

@@ -79,7 +79,7 @@ public class MdBaseBrickInfoServiceImpl extends ServiceImpl<MdBaseBrickInfoMappe
brickInfo.setWorkorder_code(workorder.getWorkorder_code()); brickInfo.setWorkorder_code(workorder.getWorkorder_code());
} }
mdBaseBrickInfoMapper.insert(brickInfo); mdBaseBrickInfoMapper.insert(brickInfo);
// todo：上传mes // 上传mes
wmsToMesService.reportBrickInfo(brickInfo); wmsToMesService.reportBrickInfo(brickInfo);
} }

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java
View File

@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController;
* @Date: 2023/6/16 * @Date: 2023/6/16
*/ */
@RestController @RestController
@RequestMapping("/api/wms") @RequestMapping("/api/wms")
@Slf4j @Slf4j
public class AcsToWmsController { public class AcsToWmsController {
@@ -26,7 +25,6 @@ public class AcsToWmsController {
private AcsToWmsService acsToWmsService; private AcsToWmsService acsToWmsService;
@PostMapping("/apply") @PostMapping("/apply")
@SaIgnore @SaIgnore
public ResponseEntity<Object> apply(@RequestBody JSONObject param) { public ResponseEntity<Object> apply(@RequestBody JSONObject param) {
return new ResponseEntity<>(acsToWmsService.acsApply(param), HttpStatus.OK); return new ResponseEntity<>(acsToWmsService.acsApply(param), HttpStatus.OK);

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -564,7 +564,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Override @Override
public BaseResponse applyOneGrab(JSONObject param) { public BaseResponse applyOneGrab(JSONObject param) {
BrickInfoDto brickInfoDto = param.toJavaObject(BrickInfoDto.class); BrickInfoDto brickInfoDto = param.toJavaObject(BrickInfoDto.class);
baseBrickInfoService.addBrickInfo(brickInfoDto); // 添加数据 baseBrickInfoService.addBrickInfo(brickInfoDto);
return BaseResponse.responseOk(brickInfoDto.getRequestNo()); return BaseResponse.responseOk(brickInfoDto.getRequestNo());
} }

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java
View File

@@ -459,8 +459,8 @@ public class WmsToMesServiceImpl implements WmsToMesService {
Integer page = pageQuery.getPage(); Integer page = pageQuery.getPage();
Integer size = pageQuery.getSize(); Integer size = pageQuery.getSize();
IPage<SemiProductGXPFDo> pages = new Page<>(page, size); IPage<SemiProductGXPFDo> pages = new Page<>(page, size);
int currentPage = page * size + 1; // start int currentPage = page * size + 1;
int currentSize = (pageQuery.getPage() + 1) * size; // end int currentSize = (pageQuery.getPage() + 1) * size;
List<SemiProductGXPFDo> mesScrapInfoList = mesRequestMapper.selectMesScrapInfo(currentPage, currentSize); List<SemiProductGXPFDo> mesScrapInfoList = mesRequestMapper.selectMesScrapInfo(currentPage, currentSize);
pages.setRecords(mesScrapInfoList); pages.setRecords(mesScrapInfoList);
int total = mesRequestMapper.getSemiProductGXPFTotal(); int total = mesRequestMapper.getSemiProductGXPFTotal();

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml
View File

@@ -51,7 +51,7 @@
IF(LENGTH(m.standard_size_height4) > 0, m.standard_size_height4, 0) AS standard_size_height4, IF(LENGTH(m.standard_size_height4) > 0, m.standard_size_height4, 0) AS standard_size_height4,
IF(LENGTH(m.single_weight) > 0, m.single_weight, 0) AS standard_weight, IF(LENGTH(m.single_weight) > 0, m.single_weight, 0) AS standard_weight,
0 AS detection_error, 0 AS detection_error,
IF(LENGTH(m.reduce_volume) > 0, m.reduce_volume, 0) AS reduce_volume, IF(LENGTH(m.reduce_volume) > 0, m.reduce_volume, 0) AS reduce_volume
FROM `pdm_bd_workorder` w FROM `pdm_bd_workorder` w
LEFT JOIN md_base_material m ON m.material_id = w.material_id LEFT JOIN md_base_material m ON m.material_id = w.material_id
WHERE w.workorder_id = #{workorderId} WHERE w.workorder_id = #{workorderId}
@@ -105,7 +105,7 @@
IF(LENGTH(m.standard_size_height4) > 0, m.standard_size_height4, 0) AS standard_size_height4, IF(LENGTH(m.standard_size_height4) > 0, m.standard_size_height4, 0) AS standard_size_height4,
IF(LENGTH(m.single_weight) > 0, m.single_weight, 0) AS standard_weight, IF(LENGTH(m.single_weight) > 0, m.single_weight, 0) AS standard_weight,
0 AS detection_error, 0 AS detection_error,
IF(LENGTH(m.reduce_volume) > 0, m.reduce_volume, 0) AS reduce_volume, IF(LENGTH(m.reduce_volume) > 0, m.reduce_volume, 0) AS reduce_volume
FROM pdm_bd_workorder w FROM pdm_bd_workorder w
LEFT JOIN md_base_material m ON m.material_id = w.material_id LEFT JOIN md_base_material m ON m.material_id = w.material_id
WHERE w.workorder_status = '1' WHERE w.workorder_status = '1'