diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java index 2f2aac62c3..d722565173 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java @@ -84,9 +84,9 @@ public class AsBusrepairBill extends BaseEntity { @ApiModelProperty("组织全路径") private String orgSidPath; @ApiModelProperty("制单部门sid") - private String deptSid; + private String deptSid; // 制单部门sid @ApiModelProperty("制单部门") - private String dept; + private String deptName; // 制单部门 @ApiModelProperty("班组sid") private String groupSid; @ApiModelProperty("班组名称") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java index 6d72545a52..a1afccf896 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java @@ -28,9 +28,9 @@ public class AsBusrepairBillDetailsVo implements Vo { @ApiModelProperty("制单人sid") private String createBySid; @ApiModelProperty("制单部门sid") - private String deptSid; + private String deptSid; // 制单部门sid @ApiModelProperty("制单部门") - private String dept; + private String deptName; // 制单部门 @ApiModelProperty("制单人姓名") private String createByName; @ApiModelProperty("操作人Sid") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java index 45ff93c4ad..9b410e759d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java @@ -25,9 +25,9 @@ public class AsBusrepairBillDto implements Dto { @ApiModelProperty("班组名称") private String groupName; @ApiModelProperty("制单部门sid") - private String deptSid; + private String deptSid; // 制单部门sid @ApiModelProperty("制单部门") - private String dept; + private String deptName; // 制单部门 @ApiModelProperty("操作人Sid") private String operatorSid; @ApiModelProperty("操作人") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java index f5015cfc59..ced307ba3d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java @@ -91,9 +91,9 @@ public class AsBusreserveBill extends BaseEntity { @ApiModelProperty("组织全路径") private String orgSidPath; // 组织全路径 @ApiModelProperty("制单部门sid") - private String createDeptSid; // 制单部门sid + private String deptSid; // 制单部门sid @ApiModelProperty("制单部门") - private String createDept; // 制单部门 + private String deptName; // 制单部门 @ApiModelProperty("客户单位") private String customerOrg; // 客户单位 diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java index ac0dc75c7e..64aaa0763c 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java @@ -92,9 +92,9 @@ public class AsBusreserveBillDetailsVo implements Vo { @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid @ApiModelProperty("制单部门sid") - private String createDeptSid; // 制单部门sid + private String deptSid; // 制单部门sid @ApiModelProperty("制单部门") - private String createDept; // 制单部门 + private String deptName; // 制单部门 @ApiModelProperty("客户单位") private String customerOrg; // 客户单位 private List sitemVos = new ArrayList<>(); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java index 04cd7dd1f8..3ba8c1e790 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java @@ -92,9 +92,9 @@ public class AsBusreserveBillDto implements Dto { @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid @ApiModelProperty("制单部门sid") - private String createDeptSid; // 制单部门sid + private String deptSid; // 制单部门sid @ApiModelProperty("制单部门") - private String createDept; // 制单部门 + private String deptName; // 制单部门 @ApiModelProperty("客户单位") private String customerOrg; // 客户单位 private List sitemVos = new ArrayList<>(); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml index 7867df35c4..3236d4c66d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml @@ -38,7 +38,7 @@ b.billNo, b.nodeName, b.useOrgName, - b.dept, + b.deptName, b.createByName, b.createTime, b.billType, @@ -59,6 +59,7 @@ FROM as_busrepair_bill AS b LEFT JOIN as_busrepair_bill_vech AS v ON b.sid = v.billSid LEFT JOIN as_busrepair_bill_invoice AS i ON b.sid = i.billSid + LEFT JOIN anrui_portal.sys_organization as s ON b.deptSid = s.sid ${ew.sqlSegment} @@ -113,7 +114,7 @@ + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java index 5f81302b0c..c7fff9d394 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java @@ -34,16 +34,10 @@ public class AsBusrepairInventorybillRest { return asBusrepairInventorybillService.saveOrUdateBill(dto); } - /* @PostMapping("/outBill") - @ApiOperation("出库") - ResultBean outBill(@RequestBody AsBusrepairInventorybillDto dto) { - return asBusrepairInventorybillService.outBill(dto); - }*/ - @PostMapping("/outBill") @ApiOperation("出库") ResultBean outBill(@RequestBody AsBusrepairInventorybillDto dto) { - return asBusrepairInventorybillService.outBill(dto); + return asBusrepairInventorybillService.newOutBill(dto); } @PostMapping("/quitBill") @@ -74,4 +68,5 @@ public class AsBusrepairInventorybillRest { } + } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java index 3b5b0ba9c1..be883e7a5a 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java @@ -4,17 +4,19 @@ import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill; import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillDetailsVo; -import com.yxt.anrui.as.api.asbusrepairbill.GoodsDetailsVo; import com.yxt.anrui.as.api.asbusrepairbill.SitemVo; import com.yxt.anrui.as.api.asbusrepairinventorybill.*; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail; -import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailDto; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailSDto; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo; +import com.yxt.anrui.as.api.enums.AsBillTypeEnum; +import com.yxt.anrui.as.api.utils.AsRule; +import com.yxt.anrui.as.api.utils.domain.AsBillNo; import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService; import com.yxt.anrui.as.biz.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailService; +import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.as.feign.wms.wmsinventorybill.WmsInventoryBillDetailDto; import com.yxt.anrui.as.feign.wms.wmsinventorybill.WmsInventoryBillDto; @@ -29,6 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -51,6 +54,8 @@ public class AsBusrepairInventorybillService extends MybatisBaseService resultBean1 = sysOrganizationFeign.fetchBySid(orgSid); + String orgCode = resultBean1.getData().getOrgCode(); + AsBillNo b = new AsBillNo(); + b.setOrgCode(orgCode); + b.setBillType(billType); + String bill = AsRule.getBill(b); + int i = baseMapper.selectNum(bill); + String billNo = AsRule.getBillNo(bill, i); + return billNo; + } + + + public ResultBean newOutBill(AsBusrepairInventorybillDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = saveBill(dto, "0"); + return rb.success().setData(sid); + } + + public String saveBill(AsBusrepairInventorybillDto dto, String busTypeKey) { + AsBusrepairInventorybill entity = new AsBusrepairInventorybill(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + if (busTypeKey.equals("0")) { + entity.setBusTypeKey("0"); + entity.setBusTypeValue("维修出库"); + String billNo = getApplyCode(dto.getCreateOrgSid(), "WXCKD"); + entity.setBillNo(billNo); + } else if (busTypeKey.equals("1")) { + entity.setBusTypeKey("1"); + entity.setBusTypeValue("维修退库"); + String billNo = getApplyCode(dto.getCreateOrgSid(), "WXTKD"); + entity.setBillNo(billNo); + } + baseMapper.insert(entity); + List detailList = dto.getDetailList(); + if (!detailList.isEmpty()) { + for (AsBusrepairInventorybillDetailSDto sDto : detailList) { + AsBusrepairInventorybillDetail detail = new AsBusrepairInventorybillDetail(); + BeanUtil.copyProperties(sDto, detail); + if (StringUtils.isNotBlank(sDto.getOutboundCount())) { + detail.setCurrentCount(new BigDecimal(sDto.getOutboundCount())); + } + + } + } + return entity.getSid(); + } + public ResultBean details(String sid) { ResultBean rb = ResultBean.fireFail(); AsBusrepairInventorybill asBusrepairInventorybill = fetchBySid(sid); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java index 23445b66c3..40b8773b73 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java @@ -373,8 +373,8 @@ public class AsBusreserveBillService extends MybatisBaseService