UDI
/
udi-spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

查询采购订单生成单据

Browse Source
master
郑明梁 2 years ago
parent d65d6acf82
commit b7bb020bfd
3 changed files with 68 additions and 64 deletions
Show Stats Download Patch File Download Diff File

3
src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java
Unescape Escape View File

@ -178,9 +178,6 @@ public class BasicBussinessTypeController extends BaseController {
public BaseResponse filterJoinByUser(FilterBussinessTypeRequest bussinessTypeFilterRequest, public BaseResponse filterJoinByUser(FilterBussinessTypeRequest bussinessTypeFilterRequest,
BindingResult bindingResult) { BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getVueType())) { if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getVueType())) {
List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.findByVueType(bussinessTypeFilterRequest.getVueType()); List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.findByVueType(bussinessTypeFilterRequest.getVueType());

122
src/main/java/com/glxp/api/controller/purchase/PurOrderController.java
Unescape Escape View File

@ -151,64 +151,70 @@ public class PurOrderController {
PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity(); PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity();
purOrderEntity.setUpdateTime(new Date()); purOrderEntity.setUpdateTime(new Date());
purOrderService.update(purOrderEntity); purOrderService.update(purOrderEntity);
// String billNo = "";
// List<PurOrderDetailEntity> purOrderDetailEntities = purOrderDetailService.findByOrderId(purOrderEntity.getId() + ""); if(postPurOrderRequest.isAutoPurchase() && StrUtil.isNotEmpty(postPurOrderRequest.getTargetBillAction())){
// String billNo = "";
// //对计划单里面的供应商进行分组 List<PurOrderDetailEntity> purOrderDetailEntities = purOrderDetailService.findByOrderId(purOrderEntity.getId() + "");
// Map<String, List<PurOrderDetailEntity>> map = purOrderDetailEntities.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId));
// //对计划单里面的供应商进行分组
// if (postPurOrderRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED) { Map<String, List<PurOrderDetailEntity>> map = purOrderDetailEntities.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId));
//
// if (CollUtil.isNotEmpty(purOrderDetailEntities) && postPurOrderRequest.isAutoPurchase() == true
// && StrUtil.isNotEmpty(postPurOrderRequest.getTargetSubInv()) && StrUtil.isNotEmpty(postPurOrderRequest.getTargetBillAction())) {
// if (CollUtil.isNotEmpty(purOrderDetailEntities) && postPurOrderRequest.isAutoPurchase() == true
// for (Map.Entry<String, List<PurOrderDetailEntity>> m : map.entrySet()) { && StrUtil.isNotEmpty(postPurOrderRequest.getTargetBillAction())) {
// //生产单据表信息
// IoOrderEntity ioOrderEntity = new IoOrderEntity(); for (Map.Entry<String, List<PurOrderDetailEntity>> m : map.entrySet()) {
// ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd"))); //生产单据表信息
// ioOrderEntity.setCorpOrderId(CustomUtil.getDate()); IoOrderEntity ioOrderEntity = new IoOrderEntity();
// ioOrderEntity.setMainAction(ConstantType.TYPE_PUT); ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd")));
// ioOrderEntity.setAction(postPurOrderRequest.getTargetBillAction()); ioOrderEntity.setCorpOrderId(CustomUtil.getDate());
// ioOrderEntity.setFromCorp(m.getKey()); ioOrderEntity.setMainAction(ConstantType.TYPE_PUT);
// ioOrderEntity.setFromType(ConstantStatus.FROM_Order); ioOrderEntity.setAction(postPurOrderRequest.getTargetBillAction());
// ioOrderEntity.setStatus(1); ioOrderEntity.setFromCorp(m.getKey());
// ioOrderEntity.setDealStatus(1); ioOrderEntity.setFromType(ConstantStatus.FROM_Order);
// ioOrderEntity.setOrderType(1); ioOrderEntity.setStatus(1);
// ioOrderEntity.setCreateTime(new Date()); ioOrderEntity.setDealStatus(1);
// ioOrderEntity.setCreateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser()); ioOrderEntity.setOrderType(1);
// ioOrderEntity.setUpdateTime(new Date()); ioOrderEntity.setCreateTime(new Date());
// ioOrderEntity.setUpdateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser()); ioOrderEntity.setCreateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser());
// ioOrderEntity.setCustomerId("110"); ioOrderEntity.setUpdateTime(new Date());
// ioOrderEntity.setDeptCode(purOrderEntity.getDeptCode()); ioOrderEntity.setUpdateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser());
// ioOrderEntity.setInvCode(purOrderEntity.getInvCode()); ioOrderEntity.setCustomerId("110");
// ioOrderService.insertOrder(ioOrderEntity); ioOrderEntity.setDeptCode(purOrderEntity.getDeptCode());
// billNo += ioOrderEntity.getBillNo() + ","; ioOrderEntity.setInvCode(purOrderEntity.getInvCode());
// //插入业务单表 ioOrderService.insertOrder(ioOrderEntity);
// for (PurOrderDetailEntity obj : m.getValue()) { billNo += ioOrderEntity.getBillNo() + ",";
// BasicProductsEntity basicProductsEntity = purOrderDetailService.selectIoOrderDetailBiz(obj.getId()); //插入业务单表
// IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); for (PurOrderDetailEntity obj : m.getValue()) {
// ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo()); BasicProductsEntity basicProductsEntity = purOrderDetailService.selectIoOrderDetailBiz(obj.getId());
// ioOrderDetailBizEntity.setBindRlFk(Long.valueOf(obj.getProductId())); IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
// ioOrderDetailBizEntity.setCount(obj.getCount()); ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo());
// ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid()); ioOrderDetailBizEntity.setBindRlFk(Long.valueOf(obj.getProductId()));
// ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode()); ioOrderDetailBizEntity.setCount(obj.getCount());
// ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc()); ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid());
// ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh()); ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode());
// ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc()); ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc());
// ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory()); ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh());
// ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname()); ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc());
// ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh()); ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory());
// if (basicProductsEntity.getPrice() != null) { ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname());
// ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice())); ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh());
// } if (basicProductsEntity.getPrice() != null) {
// ioOrderDetailBizEntity.setSupId(obj.getSupId()); ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice()));
// ioOrderDetailBizService.insert(ioOrderDetailBizEntity); }
// } ioOrderDetailBizEntity.setSupId(obj.getSupId());
// } ioOrderDetailBizService.insert(ioOrderDetailBizEntity);
// purOrderEntity.setStockOrderNo(billNo.substring(0, billNo.length() - 1)); }
// purOrderService.update(purOrderEntity); }
// } purOrderEntity.setStockOrderNo(billNo.substring(0, billNo.length() - 1));
// } purOrderService.update(purOrderEntity);
}
}
return ResultVOUtils.success("更新成功！"); return ResultVOUtils.success("更新成功！");
} }

7
src/main/java/com/glxp/api/controller/purchase/SupCertController.java
Unescape Escape View File

@ -153,6 +153,7 @@ public class SupCertController {
public BaseResponse insertCompanyCert(@RequestBody SupCertEntity supCertEntity) { public BaseResponse insertCompanyCert(@RequestBody SupCertEntity supCertEntity) {
supCertEntity.setCreateTime(new Date()); supCertEntity.setCreateTime(new Date());
supCertEntity.setUpdateTime(new Date()); supCertEntity.setUpdateTime(new Date());
supCertEntity.setStatus(0);
boolean b = supCertService.insertCompanyCert(supCertEntity); boolean b = supCertService.insertCompanyCert(supCertEntity);
return ResultVOUtils.success("成功"); return ResultVOUtils.success("成功");
} }
@ -330,7 +331,7 @@ public class SupCertController {
supData.put("status", obj.getStatus() == 0 ? "有效" : "失效"); supData.put("status", obj.getStatus() == 0 ? "有效" : "失效");
supData.put("auditStatus", getAuditStatus(obj.getAuditStatus())); supData.put("auditStatus", getAuditStatus(obj.getAuditStatus()));
supData.put("remark", obj.getRemark() == null ? ' ' : obj.getRemark()); supData.put("remark", obj.getRemark() == null ? ' ' : obj.getRemark());
supData.put("filePath", "d:/1s/udiwms/register/file/image2/" + obj.getFilePath()); supData.put("filePath", "d:/udi/udiwms/udiwmsfile/register/file/image2/" + obj.getFilePath());
list.add(supData); list.add(supData);
i++; i++;
} }
@ -442,7 +443,7 @@ public class SupCertController {
supData.put("status", obj.getStatus() == 0 ? "有效" : "失效"); supData.put("status", obj.getStatus() == 0 ? "有效" : "失效");
supData.put("auditStatus", getAuditStatus(obj.getAuditStatus())); supData.put("auditStatus", getAuditStatus(obj.getAuditStatus()));
supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark()); supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark());
supData.put("filePath", "d:/1s/udiwms/register/file/image2/" + obj.getFilePath()); supData.put("filePath", "d:/udi/udiwms/udiwmsfile/register/file/image2/" + obj.getFilePath());
list.add(supData); list.add(supData);
i++; i++;
} }
@ -504,7 +505,7 @@ public class SupCertController {
supData.put("status", obj.getStatus() == 0 ? "有效" : "失效"); supData.put("status", obj.getStatus() == 0 ? "有效" : "失效");
supData.put("auditStatus", getAuditStatus(obj.getAuditStatus())); supData.put("auditStatus", getAuditStatus(obj.getAuditStatus()));
supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark()); supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark());
supData.put("filePath", "d:/1s/udiwms/register/file/image2/" + obj.getFilePath()); supData.put("filePath", "d:/udi/udiwms/udiwmsfile/register/file/image2/" + obj.getFilePath());
list.add(supData); list.add(supData);
i++; i++;
} }

Write Preview
Loading…
Cancel
Save