From 76bb01c5b87950c719ae97430e665086f84eff22 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 29 May 2024 09:39:02 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=A2=84=E7=BA=A6?=
=?UTF-8?q?=E5=8D=95=E3=80=81=E7=BB=B4=E4=BF=AE=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../preregistration/preregistrationAdd.vue | 14 +++++++-------
.../preregistration/preregistrationInfo.vue | 10 +++++-----
.../views/operation/repairbill/repairbillAdd.vue | 8 ++++----
.../views/operation/repairbill/repairbillInfo.vue | 6 +++---
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue b/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
index da6b73d1c7..50859f596b 100644
--- a/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
+++ b/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
@@ -20,7 +20,7 @@
制单部门
- {{ formobj.createDept }}
+ {{ formobj.deptName }}
制单日期
@@ -209,8 +209,8 @@ export default {
vinNo: '',
trackLog: '',
trackLogs: [],
- createDeptSid: '',
- createDept: '',
+ deptSid: '',
+ deptName: '',
customerOrg: '',
userSid: ''
},
@@ -255,8 +255,8 @@ export default {
this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.userSid = window.sessionStorage.getItem('userSid')
- this.formobj.createDept = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
- this.formobj.createDeptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
+ this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+ this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
var nowDate = new Date()
var date = {
year: nowDate.getFullYear(),
@@ -498,8 +498,8 @@ export default {
vinNo: '',
trackLog: '',
trackLogs: [],
- createDeptSid: '',
- createDept: '',
+ deptSid: '',
+ deptName: '',
customerOrg: '',
userSid: ''
}
diff --git a/yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue b/yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue
index 0affb36750..d29781e82b 100644
--- a/yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue
+++ b/yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue
@@ -16,7 +16,7 @@
制单部门
- {{ formobj.createDept }}
+ {{ formobj.deptName }}
制单日期
@@ -117,8 +117,8 @@ export default {
vinNo: '',
trackLog: '',
trackLogs: [],
- createDeptSid: '',
- createDept: '',
+ deptSid: '',
+ deptName: '',
customerOrg: '',
userSid: ''
}
@@ -163,8 +163,8 @@ export default {
vinNo: '',
trackLog: '',
trackLogs: [],
- createDeptSid: '',
- createDept: '',
+ deptSid: '',
+ deptName: '',
customerOrg: '',
userSid: ''
}
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
index 95e02a7d1d..b796423a4d 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
@@ -21,7 +21,7 @@
制单部门
- {{ formobj.dept }}
+ {{ formobj.deptName }}
制单日期
@@ -632,7 +632,7 @@ export default {
orgPath: '',
createBySid: '',
deptSid: '',
- dept: '',
+ deptName: '',
operatorSid: '',
nodeCode: '',
settleVo: {
@@ -806,7 +806,7 @@ export default {
this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
- this.formobj.dept = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+ this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
var nowDate = new Date()
var date = {
@@ -1209,7 +1209,7 @@ export default {
orgPath: '',
createBySid: '',
deptSid: '',
- dept: '',
+ deptName: '',
operatorSid: '',
nodeCode: '',
settleVo: {
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue
index b20b61750b..c779196378 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue
@@ -17,7 +17,7 @@
制单部门
- {{ formobj.dept }}
+ {{ formobj.deptName }}
制单日期
@@ -369,7 +369,7 @@ export default {
orgPath: '',
createBySid: '',
deptSid: '',
- dept: '',
+ deptName: '',
operatorSid: '',
nodeCode: '',
settleVo: {
@@ -546,7 +546,7 @@ export default {
orgPath: '',
createBySid: '',
deptSid: '',
- dept: '',
+ deptName: '',
operatorSid: '',
nodeCode: '',
settleVo: {
From 9451259bd3d48631fb2445687a7dda0ceaefe244 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 29 May 2024 09:53:08 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=A2=84=E7=BA=A6?=
=?UTF-8?q?=E5=8D=95=E5=92=8C=E7=BB=B4=E4=BF=AE=E5=B7=A5=E5=8D=95=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/asbusrepairbill/AsBusrepairBill.java | 4 +-
.../AsBusrepairBillDetailsVo.java | 4 +-
.../asbusrepairbill/AsBusrepairBillDto.java | 4 +-
.../asbusreservebill/AsBusreserveBill.java | 4 +-
.../AsBusreserveBillDetailsVo.java | 4 +-
.../asbusreservebill/AsBusreserveBillDto.java | 4 +-
.../asbusrepairbill/AsBusrepairBillMapper.xml | 5 +-
.../AsBusrepairBillService.java | 34 ++++++----
.../AsBusrepairInventorybillMapper.java | 2 +
.../AsBusrepairInventorybillMapper.xml | 5 ++
.../AsBusrepairInventorybillRest.java | 9 +--
.../AsBusrepairInventorybillService.java | 66 ++++++++++++++++++-
.../AsBusreserveBillService.java | 4 +-
13 files changed, 112 insertions(+), 37 deletions(-)
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
Date: Wed, 29 May 2024 09:56:17 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=AE=8C=E5=96=84?=
=?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=8D=95=E5=92=8C=E7=BB=B4=E4=BF=AE=E5=B7=A5?=
=?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml
index ee6e1fa5e5..1b43dede5c 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml
@@ -5,7 +5,7 @@
-
索赔单开票申请申请列表
+
索赔单开票申请列表
@@ -68,7 +68,7 @@
-
+
@@ -159,7 +159,7 @@ export default {
total: 0,
params: {
useOrgName: '',
- createDeptName: '',
+ deptName: '',
createByName: '',
billNo: '',
createTimeStart: '',
@@ -280,7 +280,7 @@ export default {
total: 0,
params: {
useOrgName: '',
- createDeptName: '',
+ deptName: '',
createByName: '',
billNo: '',
createTimeStart: '',
diff --git a/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue b/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue
index 1c6e5c2e92..3eb72afbca 100644
--- a/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue
+++ b/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue
@@ -15,7 +15,7 @@
申请部门
- {{ formobj.createDeptName }}
+ {{ formobj.deptName }}
申请人
@@ -141,8 +141,8 @@ export default {
billNo: '',
createByName: '',
createBySid: '',
- createDeptName: '',
- createDeptSid: '',
+ deptName: '',
+ deptSid: '',
createOrgSid: '',
createTime: '',
detailList: [],
@@ -217,8 +217,8 @@ export default {
})
this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
- this.formobj.createDeptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
- this.formobj.createDeptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
+ this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+ this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
var nowDate = new Date()
var date = {
year: nowDate.getFullYear(),
@@ -375,8 +375,8 @@ export default {
billNo: '',
createByName: '',
createBySid: '',
- createDeptName: '',
- createDeptSid: '',
+ deptName: '',
+ deptSid: '',
createOrgSid: '',
createTime: '',
detailList: [],
diff --git a/yxt-as-ui/src/views/operation/claimbilling/claimbillingInfo.vue b/yxt-as-ui/src/views/operation/claimbilling/claimbillingInfo.vue
index 0d835f9b54..84f6649bd9 100644
--- a/yxt-as-ui/src/views/operation/claimbilling/claimbillingInfo.vue
+++ b/yxt-as-ui/src/views/operation/claimbilling/claimbillingInfo.vue
@@ -12,7 +12,7 @@
申请部门
- {{ formobj.createDeptName }}
+ {{ formobj.deptName }}
申请人
@@ -84,8 +84,8 @@ export default {
billNo: '',
createByName: '',
createBySid: '',
- createDeptName: '',
- createDeptSid: '',
+ deptName: '',
+ deptSid: '',
createOrgSid: '',
createTime: '',
detailList: [],
@@ -137,8 +137,8 @@ export default {
billNo: '',
createByName: '',
createBySid: '',
- createDeptName: '',
- createDeptSid: '',
+ deptName: '',
+ deptSid: '',
createOrgSid: '',
createTime: '',
detailList: [],
diff --git a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue
index 662ec2d52e..ab1fea6fbd 100644
--- a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue
@@ -15,7 +15,7 @@
申请部门
- {{ formobj.createDeptName }}
+ {{ formobj.deptName }}
申请人
@@ -126,8 +126,8 @@ export default {
billNo: '',
createByName: '',
createBySid: '',
- createDeptName: '',
- createDeptSid: '',
+ deptName: '',
+ deptSid: '',
createOrgSid: '',
createTime: '',
detailList: [],
diff --git a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue
index 7535bad09f..d852e95186 100644
--- a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue
@@ -14,7 +14,7 @@
申请部门
- {{ formobj.createDeptName }}
+ {{ formobj.deptName }}
申请人
@@ -140,8 +140,8 @@ export default {
billNo: '',
createByName: '',
createBySid: '',
- createDeptName: '',
- createDeptSid: '',
+ deptName: '',
+ deptSid: '',
createOrgSid: '',
createTime: '',
detailList: [],
@@ -213,7 +213,7 @@ export default {
if (res.success) {
this.formobj = res.data
this.formobj.instanceId = res.data.procInstId
- choiceSupplierInfo({ deptSid: this.formobj.createDeptSid }).then((resp) => {
+ choiceSupplierInfo({ deptSid: this.formobj.deptSid }).then((resp) => {
if (resp.success) {
this.supplier_list = resp.data
}
diff --git a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue
index f46b8a2a3a..8bc62a76d7 100644
--- a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue
@@ -12,7 +12,7 @@
申请部门
- {{ formobj.createDeptName }}
+ {{ formobj.deptName }}
申请人
@@ -84,8 +84,8 @@ export default {
billNo: '',
createByName: '',
createBySid: '',
- createDeptName: '',
- createDeptSid: '',
+ deptName: '',
+ deptSid: '',
createOrgSid: '',
createTime: '',
detailList: [],
From 851d163731173ad779f11c519490f49e5a0605ae Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Wed, 29 May 2024 11:50:04 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?=
=?UTF-8?q?=E5=87=BA=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/maintenance/maintenanceOutbound.js | 39 ++
.../api/maintenance/maintenanceReturnBound.js | 0
.../maintenance/maintenanceOutbound/index.vue | 359 ++++++++++++++----
.../relation/chooseproducts.vue | 7 +-
.../maintenanceReturnBound/index.vue | 20 +-
5 files changed, 331 insertions(+), 94 deletions(-)
create mode 100644 yxt-as-ui/src/api/maintenance/maintenanceOutbound.js
create mode 100644 yxt-as-ui/src/api/maintenance/maintenanceReturnBound.js
diff --git a/yxt-as-ui/src/api/maintenance/maintenanceOutbound.js b/yxt-as-ui/src/api/maintenance/maintenanceOutbound.js
new file mode 100644
index 0000000000..f36c1baf26
--- /dev/null
+++ b/yxt-as-ui/src/api/maintenance/maintenanceOutbound.js
@@ -0,0 +1,39 @@
+import request from '@/utils/request'
+
+export default {
+
+ // 初始化
+ initBill: function(data) {
+ return request({
+ url: '/as/v1/AsBusrepairInventorybill/init',
+ method: 'get',
+ params: data
+ });
+ },
+
+
+ // 查询分页列表
+ getGoodsListPage: function(params) {
+ return request({
+ url: '/wms/apiadmin/WmsOutBill/getInventoryList',
+ method: 'post',
+ data: params,
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ })
+ },
+
+ // 新增、保存
+ saveBill: function(data) {
+ return request({
+ url: '/as/v1/AsBusrepairInventorybill/outBill',
+ method: 'post',
+ data: data,
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ });
+ },
+
+}
diff --git a/yxt-as-ui/src/api/maintenance/maintenanceReturnBound.js b/yxt-as-ui/src/api/maintenance/maintenanceReturnBound.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/yxt-as-ui/src/views/maintenance/maintenanceOutbound/index.vue b/yxt-as-ui/src/views/maintenance/maintenanceOutbound/index.vue
index cc5152c388..bfee50b7e9 100644
--- a/yxt-as-ui/src/views/maintenance/maintenanceOutbound/index.vue
+++ b/yxt-as-ui/src/views/maintenance/maintenanceOutbound/index.vue
@@ -25,15 +25,15 @@
* 操作人
-
- {{formobj.goodsName}}
+
+ {{formobj.createByName}}
* 操作部门
-
- {{formobj.goodsName}}
+
+ {{formobj.deptName}}
@@ -50,8 +50,8 @@
* 领料人
-
-
+
@@ -63,7 +63,7 @@
备注
-
+
@@ -76,22 +76,22 @@
* 维修工单编号
-
- {{formobj.goodsName}}
+
+ {{formobj.sourceBillNo}}
* 单据日期
-
- {{formobj.goodsName}}
+
+ {{formobj.billDate}}
服务顾问
- {{ formobj.createTime }}
+ {{ formobj.waitorName }}
@@ -100,15 +100,15 @@
* 工单类型
-
- {{formobj.goodsName}}
+
+ {{formobj.billType}}
* 科目
-
- {{formobj.goodsName}}
+
+ {{formobj.subject}}
@@ -124,22 +124,22 @@
* 客户名称
-
- {{formobj.goodsName}}
+
+ {{formobj.customerName}}
* 车牌号/车架号
-
- {{formobj.goodsName}}
+
+ {{formobj.vehMark}}/{{formobj.vinNo}}
客户单位
- {{ formobj.createTime }}
+ {{ formobj.customerOrg }}
@@ -147,60 +147,80 @@
-
+
-
+
- 商品出库
+ 商品出库
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
- 删除
+ 删除
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
@@ -217,12 +237,15 @@
diff --git a/yxt-as-ui/src/views/maintenance/maintenanceOutbound/relation/chooseproducts.vue b/yxt-as-ui/src/views/maintenance/maintenanceOutbound/relation/chooseproducts.vue
index ff3fc82a82..1141cc140a 100644
--- a/yxt-as-ui/src/views/maintenance/maintenanceOutbound/relation/chooseproducts.vue
+++ b/yxt-as-ui/src/views/maintenance/maintenanceOutbound/relation/chooseproducts.vue
@@ -126,7 +126,8 @@
this.listLoading = true
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
- this.listQuery.params.menuUrl = this.$route.path
+ // this.listQuery.params.menuUrl = this.$route.path
+ this.listQuery.params.menuUrl = ""
getAsBusrepairBill(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
@@ -190,8 +191,8 @@
}
},
- toInfo(){
- this.$emit('backData', this.sids[0].sid)
+ toInfo(row){
+ this.$emit('backData', row.sid)
},
// 返回
handleReturn() {
diff --git a/yxt-as-ui/src/views/maintenance/maintenanceReturnBound/index.vue b/yxt-as-ui/src/views/maintenance/maintenanceReturnBound/index.vue
index 7d8446f7d7..84d6665f85 100644
--- a/yxt-as-ui/src/views/maintenance/maintenanceReturnBound/index.vue
+++ b/yxt-as-ui/src/views/maintenance/maintenanceReturnBound/index.vue
@@ -213,16 +213,16 @@
diff --git a/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue b/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue
index ff63852646..c4b60d434f 100644
--- a/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue
+++ b/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue
@@ -235,7 +235,10 @@
},
getWarehouseList() {
- req.getWarehouses().then((res) => {
+ var parpams = {
+ orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+ }
+ req.getWarehouses(parpams).then((res) => {
if (res.success) {
this.warehouseList = res.data
diff --git a/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue b/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
index ce75fa227b..b1459379d3 100644
--- a/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
+++ b/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
@@ -322,7 +322,10 @@
},
getWarehouseList() {
- req2.getWarehouses().then((res) => {
+ var parpams = {
+ orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+ }
+ req2.getWarehouses(parpams).then((res) => {
if (res.success) {
this.warehouseList = res.data
@@ -657,7 +660,7 @@
this.$refs['form_obj'].clearValidate()
})
- this.getWarehouseList()
+ // this.getWarehouseList()
this.getsupplierLust()
// this.getOrgPathSid()
var params = {
diff --git a/yxt-as-ui/src/views/storage/inOutStorage/index.vue b/yxt-as-ui/src/views/storage/inOutStorage/index.vue
index 21b4899a77..aa1e7ae16c 100644
--- a/yxt-as-ui/src/views/storage/inOutStorage/index.vue
+++ b/yxt-as-ui/src/views/storage/inOutStorage/index.vue
@@ -261,7 +261,10 @@
},
getWarehouseList() {
- req.getWarehouses().then((res) => {
+ var parpams = {
+ orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+ }
+ req.getWarehouses(parpams).then((res) => {
if (res.success) {
this.warehouseList = res.data
diff --git a/yxt-as-ui/src/views/storage/inStorage/inStorageAdd.vue b/yxt-as-ui/src/views/storage/inStorage/inStorageAdd.vue
index 9fe634012b..ede18db1d6 100644
--- a/yxt-as-ui/src/views/storage/inStorage/inStorageAdd.vue
+++ b/yxt-as-ui/src/views/storage/inStorage/inStorageAdd.vue
@@ -919,7 +919,10 @@
},
getWarehouseList() {
- req2.getWarehouses().then((res) => {
+ var parpams = {
+ orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+ }
+ req2.getWarehouses(parpams).then((res) => {
if (res.success) {
this.warehouseList = res.data
diff --git a/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/index.vue b/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/index.vue
index a82464ac2e..b10db8889d 100644
--- a/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/index.vue
+++ b/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/index.vue
@@ -9,11 +9,11 @@
@@ -57,17 +57,17 @@
-
- {{ scope.row.confirmResult }}
+
+ {{ scope.row.billNo }}
-
-
-
-
-
-
+
+
+
+
+
+
@@ -82,26 +82,26 @@
-
-
+
+
+
diff --git a/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceReturnBoundInfo.vue b/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceReturnBoundInfo.vue
new file mode 100644
index 0000000000..f2305bde53
--- /dev/null
+++ b/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceReturnBoundInfo.vue
@@ -0,0 +1,272 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 制单人
+
+ {{formobj.createByName}}
+
+
+
+
+ 制单部门
+
+ {{formobj.deptName}}
+
+
+
+
+ 制单日期
+
+ {{ formobj.createTime }}
+
+
+
+
+
+
+
+
+ 领料人
+
+ {{formobj.warehouseManager}}
+
+
+
+
+ 备注
+
+ {{formobj.remarks}}
+
+
+
+
+
+
+
+
+
+ 维修工单编号
+
+ {{formobj.sourceBillNo}}
+
+
+
+
+ 单据日期
+
+ {{formobj.billDate}}
+
+
+
+
+ 服务顾问
+
+ {{ formobj.waitorName }}
+
+
+
+
+
+
+
+ 工单类型
+
+ {{formobj.billType}}
+
+
+
+
+ 科目
+
+ {{formobj.subject}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 客户名称
+
+ {{formobj.customerName}}
+
+
+
+
+ 车牌号/车架号
+
+ {{formobj.vehMark}}/{{formobj.vinNo}}
+
+
+
+
+ 客户单位
+
+ {{ formobj.customerOrg }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue b/yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue
index 227441122c..fcdd4dac82 100644
--- a/yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue
+++ b/yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue
@@ -390,7 +390,10 @@
})
},
getWarehouseList() {
- req.getWarehouses().then((res) => {
+ var parpams = {
+ orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+ }
+ req.getWarehouses(parpams).then((res) => {
if (res.success) {
this.warehouseList = res.data
diff --git a/yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue b/yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue
index 0975301087..255ab7fa0d 100644
--- a/yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue
+++ b/yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue
@@ -383,7 +383,10 @@
})
},
getWarehouseList() {
- req.getWarehouses().then((res) => {
+ var parpams = {
+ orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+ }
+ req.getWarehouses(parpams).then((res) => {
if (res.success) {
this.warehouseList = res.data
diff --git a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
index f3f12bdbb0..8ef21a7aef 100644
--- a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
+++ b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
@@ -771,7 +771,7 @@
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
}
- req2.getWarehouses().then((res) => {
+ req2.getWarehouses(parpams).then((res) => {
if (res.success) {
this.warehouseList = res.data
diff --git a/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue b/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue
index 589bf69013..73a3531d18 100644
--- a/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue
+++ b/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue
@@ -334,7 +334,10 @@
},
getWarehouseList() {
- req2.getWarehouses().then((res) => {
+ var parpams = {
+ orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+ }
+ req2.getWarehouses(parpams).then((res) => {
if (res.success) {
this.warehouseList = res.data
diff --git a/yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue b/yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue
index 05b2a19aad..1331e88bd1 100644
--- a/yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue
+++ b/yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue
@@ -341,7 +341,10 @@
},
getWarehouseList() {
- req2.getWarehouses().then((res) => {
+ var parpams = {
+ orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+ }
+ req2.getWarehouses(parpams).then((res) => {
if (res.success) {
this.warehouseList = res.data