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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-11-14 13:57:58 +08:00
parent e2ef7b21e8
commit dffe718aff
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/modules/common/utils/SecurityUtils.java
View File

@@ -7,6 +7,8 @@ import cn.hutool.json.JSONObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nl.modules.common.utils.dto.CurrentUser; import org.nl.modules.common.utils.dto.CurrentUser;
import org.nl.modules.system.service.dto.UserDto; import org.nl.modules.system.service.dto.UserDto;
import org.nl.modules.system.service.impl.UserServiceImpl;
import org.nl.modules.wql.util.SpringContextHolder;
import java.util.List; import java.util.List;
@@ -34,6 +36,8 @@ public class SecurityUtils {
currentUser.setId((long) 2); currentUser.setId((long) 2);
currentUser.setNickName("默认用户"); currentUser.setNickName("默认用户");
currentUser.setUsername("default"); currentUser.setUsername("default");
UserDto userDto = SpringContextHolder.getBean(UserServiceImpl.class).findById(2);
currentUser.setUser(userDto);
return currentUser; return currentUser;
} }
return null; return null;

14
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -446,7 +446,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
jsonMap.put("flag", "1"); jsonMap.put("flag", "1");
jsonMap.put("material_id", dtl.getString("material_id")); jsonMap.put("material_id", dtl.getString("material_id"));
jsonMap.put("sale_order_name", dtl.getString("source_bill_code")); jsonMap.put("sale_order_name", dtl.getString("source_bill_code"));
jsonMap.put("sect_id", whereJson.getString("sect_id")); jsonMap.put("sect_id", RegionTypeEnum.ZC01.getId());
JSONObject jsonOneIvt = WQL.getWO("ST_OUTIVT01").addParamMap(jsonMap).process().uniqueResult(0); JSONObject jsonOneIvt = WQL.getWO("ST_OUTIVT01").addParamMap(jsonMap).process().uniqueResult(0);
if (ObjectUtil.isEmpty(jsonOneIvt)) throw new BadRequestException("库存不足"); if (ObjectUtil.isEmpty(jsonOneIvt)) throw new BadRequestException("库存不足");
@@ -655,7 +655,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
jsonMap.put("flag", "1"); jsonMap.put("flag", "1");
jsonMap.put("material_id", dtl.getString("material_id")); jsonMap.put("material_id", dtl.getString("material_id"));
jsonMap.put("sale_order_name", dtl.getString("source_bill_code")); jsonMap.put("sale_order_name", dtl.getString("source_bill_code"));
jsonMap.put("sect_id", whereJson.getString("sect_id")); jsonMap.put("sect_id", RegionTypeEnum.ZC01.getId());
JSONObject jsonOneIvt = WQL.getWO("ST_OUTIVT01").addParamMap(jsonMap).process().uniqueResult(0); JSONObject jsonOneIvt = WQL.getWO("ST_OUTIVT01").addParamMap(jsonMap).process().uniqueResult(0);
if (ObjectUtil.isEmpty(jsonOneIvt)) throw new BadRequestException("库存不足"); if (ObjectUtil.isEmpty(jsonOneIvt)) throw new BadRequestException("库存不足");
@@ -1804,10 +1804,14 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
jsonDis.put("work_status", "99"); jsonDis.put("work_status", "99");
wo_dis.update(jsonDis); wo_dis.update(jsonDis);
// 更新明细为完成 // 判断此明细下是否还有未完成的分配明细
JSONObject jsonDtl = wo_dtl.query("iostorinvdtl_id = '" + jsonDis.getString("iostorinvdtl_id") + "'").uniqueResult(0); JSONObject jsonDtl = wo_dtl.query("iostorinvdtl_id = '" + jsonDis.getString("iostorinvdtl_id") + "'").uniqueResult(0);
jsonDtl.put("bill_status", "99"); JSONArray disArr2 = wo_dis.query("iostorinvdtl_id = '" + jsonDtl.getString("iostorinvdtl_id") + "' and work_status <> '99'").getResultJSONArray(0);
wo_dtl.update(jsonDtl); if (ObjectUtil.isEmpty(disArr2)) {
// 更新明细为完成
jsonDtl.put("bill_status", "99");
wo_dtl.update(jsonDtl);
}
} }
//判断是否还有未完成的明细 //判断是否还有未完成的明细