Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/api/operation/repairbill.js

@@ -20,9 +20,9 @@ export default {
     })
   },
     // 查询分页列表 -- 维修单出厂 -- 出厂确认
-    carOutFactory: function(data) {
+  confirmOut: function(data) {
         return request({
-            url: '/as/v1/AsBusrepairBill/carOutFactory',
+            url: '/as/v1/AsBusrepairBill/confirmOut',
             method: 'post',
             data: data,
             headers: { 'Content-Type': 'application/json' }
@@ -85,9 +85,9 @@ export default {
     })
   },
   // 打印出门证
-  printCard: function(data) {
+  createPdf: function(data) {
     return request({
-      url: '/as/v1/AsBusrepairBill/printCard',
+      url: '/as/v1/AsBusrepairBill/createPdf',
       method: 'post',
       params: data
     })

yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue

@@ -387,7 +387,7 @@ export default {
           spinner: 'el-icon-loading',
           background: 'rgba(0, 0, 0, 0.7)'
         })
-        req.carOutFactory(this.sids).then((res) => {
+        req.confirmOut(this.sids).then((res) => {
           if (res.success) {
             this.$message({ showClose: true, type: 'success', message: '操作成功' })
             this.getList()
@@ -402,7 +402,7 @@ export default {
     toPrint() {
       if (this.sids.length === 1) {
         if (this.multipleSelection[0].isOutFactory === '是') {
-          req.printCard({ sid: this.sids[0] }).then((res) => {
+          req.createPdf({ sid: this.sids[0] }).then((res) => {
             if (res.success) {
               var xhr = new XMLHttpRequest()
               xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + res.data + '&outFileName=' + '出门证', true)

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -193,6 +193,31 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         for (String sid : sids) {
             //修改维修工单出厂状态为已出厂
             baseMapper.updateOutDoorState(sid);
+            //推送回访单
+            AsBusrepairBill asBusrepairBill = fetchBySid(sid);
+            AsTrackBillDto asTrackBillDto = new AsTrackBillDto();
+            asTrackBillDto.setCreateBySid(asBusrepairBill.getCreateBySid());
+            asTrackBillDto.setSourceBillSid(asBusrepairBill.getSid());
+            asTrackBillDto.setSourceBillNo(asBusrepairBill.getBillNo());
+            asTrackBillDto.setSettleDate(asBusrepairBill.getSettleTime());
+            asTrackBillDto.setWaitorSid(asBusrepairBill.getWaitorSid());
+            asTrackBillDto.setWaitorName(asBusrepairBill.getWaitorName());
+            Calendar calendar = Calendar.getInstance();
+            if (StringUtils.isNotBlank(asBusrepairBill.getSettleTime())){
+                calendar.setTime(DateUtil.parseDate(asBusrepairBill.getSettleTime()));
+            }else {
+                calendar.setTime(new Date());
+            }
+            calendar.add(Calendar.DAY_OF_MONTH, 3);
+            asTrackBillDto.setReserveDate(DateUtil.formatDate(calendar.getTime()));
+            asTrackBillDto.setDeptSid(asBusrepairBill.getDeptSid());
+            asTrackBillDto.setDeptName(asBusrepairBill.getDeptName());
+            asTrackBillDto.setUseOrgSid(asBusrepairBill.getUseOrgSid());
+            asTrackBillDto.setUseOrgName(asBusrepairBill.getUseOrgName());
+            asTrackBillDto.setCreateOrgSid(asBusrepairBill.getCreateOrgSid());
+            asTrackBillDto.setCreateOrgName(asBusrepairBill.getCreateOrgName());
+            asTrackBillDto.setReason("01");
+            asTrackBillService.saveOrUpdateDto(asTrackBillDto);
         }
     }
 
@@ -1618,26 +1643,6 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                 billNode.setCreateBySid(dto.getOperatorSid());
                 billNode.setNodeCode("6");
                 asBusrepairBillNodeService.insert(billNode);
-                AsTrackBillDto asTrackBillDto = new AsTrackBillDto();
-                asTrackBillDto.setCreateBySid(asBusrepairBill.getCreateBySid());
-                asTrackBillDto.setSourceBillSid(asBusrepairBill.getSid());
-                asTrackBillDto.setSourceBillNo(asBusrepairBill.getBillNo());
-                FmsReceivesettle fmsReceivesettle = fmsReceivesettleFeign.fetchBySourceSid(asBusrepairBill.getSid()).getData();
-                asTrackBillDto.setSettleDate(DateUtil.formatDate(fmsReceivesettle.getSettleTime()));
-                asTrackBillDto.setWaitorSid(asBusrepairBill.getWaitorSid());
-                asTrackBillDto.setWaitorName(asBusrepairBill.getWaitorName());
-                Calendar calendar = Calendar.getInstance();
-                calendar.setTime(fmsReceivesettle.getSettleTime());
-                calendar.add(Calendar.DAY_OF_MONTH, 3);
-                asTrackBillDto.setReserveDate(DateUtil.formatDate(calendar.getTime()));
-                asTrackBillDto.setDeptSid(asBusrepairBill.getDeptSid());
-                asTrackBillDto.setDeptName(asBusrepairBill.getDeptName());
-                asTrackBillDto.setUseOrgSid(asBusrepairBill.getUseOrgSid());
-                asTrackBillDto.setUseOrgName(asBusrepairBill.getUseOrgName());
-                asTrackBillDto.setCreateOrgSid(asBusrepairBill.getCreateOrgSid());
-                asTrackBillDto.setCreateOrgName(asBusrepairBill.getCreateOrgName());
-                asTrackBillDto.setReason("01");
-                asTrackBillService.saveOrUpdateDto(asTrackBillDto);
             }
         }
         return rb.success();