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

opt: 修复4

Browse Source
This commit is contained in:
liyongde
2025-11-01 11:09:16 +08:00
parent 1bcdd80d79
commit 0b63fa9caa
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/dto/mes/MesBackMaterialRequestDto.java
View File

@@ -13,7 +13,6 @@ public class MesBackMaterialRequestDto {
private String qty_unit_name; private String qty_unit_name;
@NotBlank(message = "数量不可为空")
private String qty; private String qty;
private String remark; private String remark;

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java
View File

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.nl.common.base.TableDataInfo; import org.nl.common.base.TableDataInfo;
@@ -83,6 +84,7 @@ import static org.nl.wms.warehouse_manage.enums.IOSEnum.GROUP_PLATE_STATUS;
* @author Liuxy * @author Liuxy
* @since 2025-06-05 * @since 2025-06-05
*/ */
@Slf4j
@Service @Service
public class PdaIosInServiceImpl implements PdaIosInService { public class PdaIosInServiceImpl implements PdaIosInService {
@@ -649,6 +651,7 @@ public class PdaIosInServiceImpl implements PdaIosInService {
@Override @Override
@Transactional @Transactional
public PdaResponse vehicleInConfirm(JSONObject whereJson) { public PdaResponse vehicleInConfirm(JSONObject whereJson) {
log.info("vehicleInConfirm - {}", whereJson);
//空载具入库 //空载具入库
Sectattr sectattr = sectattrService.findById(whereJson.getString("sect_code")); Sectattr sectattr = sectattrService.findById(whereJson.getString("sect_code"));
if (sectattr == null) { if (sectattr == null) {

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.xml
View File

@@ -81,6 +81,8 @@
vehicle_code, vehicle_code,
point_code1, point_code1,
point_code2, point_code2,
point_code3,
point_code4,
(CASE task_status (CASE task_status
WHEN '0' THEN '生成' WHEN '0' THEN '生成'
WHEN '1' THEN '申请' WHEN '1' THEN '申请'

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java
View File

@@ -373,7 +373,7 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
@Override @Override
public SchBasePoint getPointByExtCode(String deviceCode) { public SchBasePoint getPointByExtCode(String deviceCode) {
List<SchBasePoint> schBasePointList = pointMapper.selectList(new LambdaQueryWrapper<SchBasePoint>() List<SchBasePoint> schBasePointList = pointMapper.selectList(new LambdaQueryWrapper<SchBasePoint>()
.eq(SchBasePoint::getExt_point_code, deviceCode)); .eq(SchBasePoint::getExt_point_code, deviceCode).or().eq(SchBasePoint::getPoint_code, deviceCode));
if(schBasePointList.isEmpty()){ if(schBasePointList.isEmpty()){
return null; return null;
} }