@@ -26,7 +26,7 @@
至
+
@@ -97,7 +97,7 @@
{{ scope.row.outDoorState == '1' ? '是' : scope.row.outDoorState == '0' ? '否' :'' }}
-
+
{{ scope.row.billNo }}
@@ -107,7 +107,7 @@
-
@@ -26,7 +26,7 @@
至
+
@@ -92,7 +92,7 @@
+
{{ scope.row.billNo }}
@@ -102,7 +102,7 @@
-
@@ -26,7 +26,7 @@
至
+
@@ -92,7 +92,7 @@
+
{{ scope.row.billNo }}
@@ -102,7 +102,7 @@
-
@@ -26,7 +26,7 @@
至
+
@@ -92,7 +92,7 @@
+
{{ scope.row.billNo }}
@@ -102,7 +102,7 @@
-
@@ -26,7 +26,7 @@
至
+
@@ -92,7 +92,7 @@
+
{{ scope.row.billNo }}
@@ -102,7 +102,7 @@
- {{ formobj.billType }}
@@ -137,7 +137,7 @@
-
+
-
+
{{ formobj.invoiceVo.invoiceType }}
+
+ {{ formobj.invoiceVo.taxRate }}
+
+
+
{{ formobj.invoiceVo.invoiceCompany }}
+
+
+
+
+
+
-
-
{{ formobj.outAmount }}
+
+
{{ formobj.subsidyAmount }}
+
+
{{ formobj.rescueAmount }}
+
+
{{ ysTotal }} = 工时费：{{ gsfTotal }} + 材料费：{{ clfTotal }} + 附加费：{{ fjfTotal }} + 税额：0
+ {{ ysTotal }} = 工时费：{{ gsfTotal }} + 材料费：{{ clfTotal }} + 附加费：{{ fjfTotal }}
@@ -355,7 +391,9 @@ export default {
invoiceType: '',
invoiceTypeKey: '',
invoiceCompanySid: '',
- invoiceCompany: ''
+ invoiceCompany: '',
+ taxRate: '',
+ taxItems: []
},
insuranceVo: {
responsibility: '',
@@ -391,8 +429,11 @@ export default {
addAmount: '',
taxAmount: '',
outAmount: '',
+ outKPAmount: '',
subsidyAmount: '',
+ subsidyKPAmount: '',
rescueAmount: '',
+ rescueKPAmount: '',
actualAmount: '',
receivableAmount: '',
subsidyRemarks: '',
@@ -407,7 +448,7 @@ export default {
}
},
computed: {
- // 计算工时费 = 服务项目列表中所有销售价之和
+ // 计算工时费 = 维修项目列表中所有销售价之和
gsfTotal() {
let gsf = '0'
if (this.formobj.sitemVos.length > 0) {
@@ -450,7 +491,7 @@ export default {
ys = Math.round((parseFloat(ys) + parseFloat(this.gsfTotal) + parseFloat(this.clfTotal) + parseFloat(this.fjfTotal)) * 100) / 100
return ys
},
- // 优惠 = 服务项目列表中的所有优惠之和 + 商品列表中所有优惠之和
+ // 优惠 = 维修项目列表中的所有优惠之和 + 商品列表中所有优惠之和
yhTotal() {
let yh = '0'
if (this.formobj.sitemVos.length > 0) {
@@ -492,6 +533,13 @@ export default {
}
})
}
+ if (this.formobj.goodsDetailsVos.length > 0) {
+ this.formobj.goodsDetailsVos.forEach((e) => {
+ if (e.partsSellers.length > 0) {
+ e.partsSellers = e.partsSellers.join(',')
+ }
+ })
+ }
}
})
},
@@ -560,7 +608,9 @@ export default {
invoiceType: '',
invoiceTypeKey: '',
invoiceCompanySid: '',
- invoiceCompany: ''
+ invoiceCompany: '',
+ taxRate: '',
+ taxItems: []
},
insuranceVo: {
responsibility: '',
@@ -596,8 +646,11 @@ export default {
addAmount: '',
taxAmount: '',
outAmount: '',
+ outKPAmount: '',
subsidyAmount: '',
+ subsidyKPAmount: '',
rescueAmount: '',
+ rescueKPAmount: '',
actualAmount: '',
receivableAmount: '',
subsidyRemarks: '',
diff --git a/yxt-as-ui/src/views/operation/workorderquery/workorderquery.vue b/yxt-as-ui/src/views/operation/workorderquery/workorderquery.vue
index f5f5f921cf..2c719c2169 100644
--- a/yxt-as-ui/src/views/operation/workorderquery/workorderquery.vue
+++ b/yxt-as-ui/src/views/operation/workorderquery/workorderquery.vue
@@ -2,7 +2,7 @@
工单类型
+ 维修单类型
责任划分
@@ -162,7 +162,7 @@
是否开发票
@@ -172,17 +172,34 @@
发票类型
税率
+ 开票单位
加税点的项目
+ 服务项目
+ 维修项目
商品
+ 维修用料
前台登记时对商品要求备注
@@ -203,24 +220,33 @@
附加项目
外出费(元)
-
+ {{ formobj.outAmount }}
+ 开票金额：{{ formobj.outKPAmount }}
+
+ 备注
@@ -230,7 +256,12 @@
厂家补助(元)
-
+ {{ formobj.subsidyAmount }}
+ 开票金额：{{ formobj.subsidyKPAmount }}
+
+ 备注
@@ -240,7 +271,12 @@
施救费(元)
-
+ {{ formobj.rescueAmount }}
+ 开票金额：{{ formobj.rescueKPAmount }}
+
+ 备注
@@ -263,7 +299,7 @@
应收合计：
-
- fileName = new ArrayList<>(); //文件名称
@ApiModelProperty("商品登记备注")
private String registerRemarks;
+ private List files = new ArrayList<>(); //文件名称
}
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 9395dcfabb..b159509e20 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
@@ -151,4 +151,6 @@ public class AsBusrepairBillDto implements Dto {
private List fileName = new ArrayList<>(); //文件名称
@ApiModelProperty("商品登记备注")
private String registerRemarks;
+ @ApiModelProperty("附加费")
+ private String addAmount;
}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/GoodsDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/GoodsDetailsVo.java
index 88852b4b92..5d2b033fb9 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/GoodsDetailsVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/GoodsDetailsVo.java
@@ -68,5 +68,9 @@ public class GoodsDetailsVo implements Vo {
private List partsSellersSids = new ArrayList<>();
@ApiModelProperty("配件销售")
private List partsSellers = new ArrayList<>();
+ @ApiModelProperty("维修项目")
+ private String serviceItem;
+ @ApiModelProperty("配件销售人")
+ private String partsSellers2;
}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java
index 3417e91956..6004d83029 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java
@@ -20,6 +20,8 @@ public class InsuranceVo {
private String responsibilityKey;
@ApiModelProperty("是否存在人伤（1是，0否）")
private String isPersonInjuries;
+ @ApiModelProperty("是否存在人伤（1是，0否）")
+ private String isPersonInjuries2;
@ApiModelProperty("责任比例Key")
private String responsibilityRatioKey;
@ApiModelProperty("责任比例")
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java
index acb73550c8..ba6f106300 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java
@@ -17,6 +17,8 @@ public class InvoiceVo {
@ApiModelProperty("是否需要开发票（是1，否0）")
private String isInvoicing;
+ @ApiModelProperty("是否需要开发票（是1，否0）")
+ private String isInvoicing2;
@ApiModelProperty("发票类型")
private String invoiceType;
@ApiModelProperty("发票类型")
@@ -35,4 +37,6 @@ public class InvoiceVo {
private String invoiceCompany;
@ApiModelProperty("加税点项目“,”英文逗号拼接")
private List taxItems = new ArrayList<>();
+ @ApiModelProperty("加税点项目")
+ private String taxItems2;
}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SitemVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SitemVo.java
index b7cff9f8e8..ca304690b5 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SitemVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SitemVo.java
@@ -45,6 +45,10 @@ public class SitemVo {
private String repairerName;
@ApiModelProperty("销售价格常量")
private String sitemPrice;
+ @ApiModelProperty("维修技师 ‘、’ 拼接")
+ private String staffNames;
+ @ApiModelProperty("单价-100，工时数-5小时，提成-100")
+ private String manHourInfo;
//-------------维修人员---------------
// @ApiModelProperty("维修人员sid")
// private String repairerSid;
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/GoodsReceiveListVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/GoodsReceiveListVo.java
new file mode 100644
index 0000000000..f30ee2c964
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/GoodsReceiveListVo.java
@@ -0,0 +1,29 @@
+package com.yxt.anrui.as.api.asbusrepairbill.app;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/8/2 15:27
+ */
+@Data
+public class GoodsReceiveListVo {
+
+
+ /**
+ * 数量
+ */
+ private String num;
+ /**
+ * 记录sid
+ */
+ private String sid;
+ /**
+ * 商品相关信息，商品名称+换行符+图号
+ */
+ private String val;
+//
+// private String goodsSpuName;
+// private String goodsSkuCode;
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/GoodsReceiveQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/GoodsReceiveQuery.java
new file mode 100644
index 0000000000..fbabeb2baa
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/GoodsReceiveQuery.java
@@ -0,0 +1,20 @@
+package com.yxt.anrui.as.api.asbusrepairbill.app;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/8/2 15:23
+ */
+@Data
+public class GoodsReceiveQuery implements Query {
+ private String menuSid;
+ /**
+ * jkeyword
+ */
+ private String name;
+ private String orgPath;
+ private String userSid;
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/GoodsReceiveSubmit.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/GoodsReceiveSubmit.java
new file mode 100644
index 0000000000..b9b756bfb5
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/GoodsReceiveSubmit.java
@@ -0,0 +1,18 @@
+package com.yxt.anrui.as.api.asbusrepairbill.app;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/8/2 16:23
+ */
+@Data
+public class GoodsReceiveSubmit {
+
+ private String userSid;
+ private List list = new ArrayList<>();
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/GoodsReceiveVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/GoodsReceiveVo.java
new file mode 100644
index 0000000000..800efa67e9
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/GoodsReceiveVo.java
@@ -0,0 +1,48 @@
+package com.yxt.anrui.as.api.asbusrepairbill.app;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/8/2 15:23
+ */
+@Data
+public class GoodsReceiveVo {
+
+ /**
+ * 工单编号
+ */
+ private String billId;
+ /**
+ * 工单类型
+ */
+ private String billType;
+ /**
+ * 客户名称
+ */
+ private String customerName;
+ /**
+ * 进厂时间
+ */
+ private String entryTime;
+ /**
+ * 车架号集合
+ */
+ private List list = new ArrayList<>();
+ /**
+ * 维修工单sid
+ */
+ private String sid;
+ /**
+ * 科目
+ */
+ private String subject;
+ /**
+ * 车牌号
+ */
+ private String vehMark;
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventoryBillInit.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventoryBillInit.java
index 89ec534ed1..dfd5dd1f12 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventoryBillInit.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventoryBillInit.java
@@ -62,6 +62,7 @@ public class AsBusrepairInventoryBillInit {
private List sitemVoList = new ArrayList<>();
@ApiModelProperty("商品登记备注")
private String registerRemarks;
+ private String isGoOut;
private List detailList = new ArrayList<>();
}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java
index eb35c2b54b..d3205b78da 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java
@@ -1,10 +1,12 @@
package com.yxt.anrui.as.api.asbusrepairinventorybilldetail;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.Date;
/**
* @description:
@@ -83,4 +85,8 @@ public class AsBusrepairInventorybillDetail extends BaseEntity {
private String partsSellersSid;
@ApiModelProperty("配件销售")
private String partsSellers;
+
+ @ApiModelProperty("接收时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ private Date receivedTime;
}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java
index 1b6422c91d..8920f05b17 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.as.api.asbusrepairbill.*;
+import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveListVo;
+import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveVo;
import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -50,4 +52,8 @@ public interface AsBusrepairBillMapper extends BaseMapper {
@Update("update as_busrepair_bill set isOutFactory = '1' where sid = #{sid}")
void updateOutFactory(String sid);
+
+ IPage notConfirmList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ List selGoodsReceiveByBillSid(@Param("sid") String sid);
}
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 cbfc4e29f8..568e267b86 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
@@ -182,4 +182,34 @@
${ew.sqlSegment}
+
+
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java
index 0b7ad14bca..06d8f4e8c3 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java
@@ -1,6 +1,9 @@
package com.yxt.anrui.as.biz.asbusrepairbill;
import com.yxt.anrui.as.api.asbusrepairbill.*;
+import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveQuery;
+import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveSubmit;
+import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -175,4 +178,27 @@ public class AsBusrepairBillRest {
PagerVo pv = asBusrepairBillService.bwBillPageList(pagerQuery);
return rb.success().setData(pv);
}
+
+ //----------------------------app配件接收-----------------------------
+ @PostMapping("/notConfirmList")
+ @ApiOperation("获取配件确认列表")
+ ResultBean> notConfirmList(@RequestBody PagerQuery pagerQuery) {
+ ResultBean> rb = ResultBean.fireFail();
+ PagerVo pv = asBusrepairBillService.notConfirmList(pagerQuery);
+ return rb.success().setData(pv);
+ }
+
+ @PostMapping("/submitList")
+ @ApiOperation("配件确认提交")
+ ResultBean submitList(@RequestBody GoodsReceiveSubmit query) {
+ ResultBean rb = ResultBean.fireFail();
+ asBusrepairBillService.submitList(query);
+ return rb.success();
+ }
+
+ @ApiOperation("app详情回显")
+ @GetMapping("/fetchDetailsBySid2/{sid}")
+ public ResultBean fetchDetailsBySid2(@PathVariable("sid") String sid) {
+ return asBusrepairBillService.fetchDetailsBySid(sid);
+ }
}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
index 48ee92ebea..ac299f01c3 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
@@ -7,6 +7,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.as.api.asappendix.AsAppendix;
import com.yxt.anrui.as.api.asbusrepairbill.*;
+import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveListVo;
+import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveQuery;
+import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveSubmit;
+import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveVo;
import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem;
import com.yxt.anrui.as.api.asbusrepairbillinsurance.AsBusrepairBillInsurance;
import com.yxt.anrui.as.api.asbusrepairbillinsurancerecord.AsBusrepairBillInsuranceRecord;
@@ -60,9 +64,12 @@ import com.yxt.anrui.as.feign.sms.SmsGoods;
import com.yxt.anrui.as.feign.sms.SmsGoodsFeign;
import com.yxt.anrui.as.feign.wms.wmsoldinventory.WmsOldInventoryFeign;
import com.yxt.anrui.as.feign.wms.wmsoldinventory.WmsOldInventoryPush;
+import com.yxt.common.base.config.component.DocPdfComponent;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.ConstantUtils;
import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.WordConvertUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -72,12 +79,17 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.io.File;
+import java.io.InputStream;
import java.math.BigDecimal;
+import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.*;
+import static java.util.Comparator.comparing;
+
/**
* @description:
* @author: dimengzhe
@@ -134,6 +146,9 @@ public class AsBusrepairBillService extends MybatisBaseService());
+ }
+ if (null != invoice.getIsInvoicing()) {
+ if (invoice.getIsInvoicing().intValue() == 1) {
+ invoiceVo.setIsInvoicing2("是");
+ } else if (invoice.getIsInvoicing().intValue() == 0) {
+ invoiceVo.setIsInvoicing2("否");
+ }
}
vo.setInvoiceVo(invoiceVo);
}
AsBusrepairBillInsurance insurance = asBusrepairBillInsuranceService.fetchByBillSid(sid);
if (null != insurance) {
BeanUtil.copyProperties(insurance, insuranceVo);
+ if (StringUtils.isNotBlank(insurance.getIsPersonInjuries())) {
+ if (insurance.getIsPersonInjuries().equals("1")) {
+ insuranceVo.setIsPersonInjuries2("是");
+ } else if (insurance.getIsPersonInjuries().equals("0")) {
+ insuranceVo.setIsPersonInjuries2("否");
+ }
+ }
}
List insuranceRecord = asBusrepairBillInsuranceRecordService.fetchByBillSid(sid);
if (!insuranceRecord.isEmpty()) {
@@ -534,6 +587,19 @@ public class AsBusrepairBillService extends MybatisBaseService repairers = asBusrepairBillSitemRepairerService.fetchByBillSid(sid, sitem.getServiceItemSid());
if (!repairers.isEmpty()) {
List staffList = new ArrayList<>(); //维修人员信息
@@ -548,6 +614,7 @@ public class AsBusrepairBillService extends MybatisBaseService goodsDetails = asBusrepairInventorybillDetailService.getGoodsDetailsByBillSid(sid);
+ DecimalFormat df2 =new DecimalFormat("#.00");
if (!goodsDetails.isEmpty()) {
for (AsBusrepairInventorybillDetail goodsDetail : goodsDetails) {
GoodsDetailsVo goodsDetailsVo = new GoodsDetailsVo();
BeanUtil.copyProperties(goodsDetail, goodsDetailsVo);
BigDecimal constPrice = BigDecimal.ZERO; //销售价常量
boolean isTaxRate = false; //进货价是否含税
+ if (null != goodsDetail.getReceivedTime()) {
+ goodsDetailsVo.setReceivedTime(sdf.format(goodsDetail.getReceivedTime()));
+ }
SmsGoods smsGoods = smsGoodsFeign.fetchEntityByGoodsID(goodsDetail.getGoodsID()).getData();
if (null != smsGoods) {
if (StringUtils.isNotBlank(smsGoods.getSupplierName())) {
@@ -594,12 +665,17 @@ public class AsBusrepairBillService extends MybatisBaseService list = Arrays.asList(strings);
goodsDetailsVo.setPartsSellersSids(list);
+ } else {
+ goodsDetailsVo.setPartsSellersSids(new ArrayList<>());
}
if (StringUtils.isNotBlank(goodsDetail.getPartsSellers())) {
String partsSellers = goodsDetail.getPartsSellers();
String[] strings = partsSellers.split(",");
List list = Arrays.asList(strings);
goodsDetailsVo.setPartsSellers(list);
+ goodsDetailsVo.setPartsSellers2(goodsDetail.getPartsSellers());
+ } else {
+ goodsDetailsVo.setPartsSellers(new ArrayList<>());
}
if (goodsDetail.getIsTaxRate() != null) {
if (goodsDetail.getIsTaxRate().intValue() == 1) {
@@ -610,7 +686,7 @@ public class AsBusrepairBillService extends MybatisBaseService file = new ArrayList<>();
+ List file2 = new ArrayList<>();
List asAppendices = asAppendixService.fetchByLinkSid(sid);
if (!asAppendices.isEmpty()) {
for (AsAppendix asAppendix : asAppendices) {
@@ -651,9 +728,12 @@ public class AsBusrepairBillService extends MybatisBaseService claimNos = asBusclaimBillService.selectByRepairBillSid(sid);
if (!claimNos.isEmpty()) {
- vo.setClaimNo(String.join(",",claimNos));
+ vo.setClaimNo(String.join(",", claimNos));
}
if (StringUtils.isNotBlank(detailsVo.getVinNo())) {
vo.setVinNo(detailsVo.getVinNo());
@@ -1580,15 +1673,15 @@ public class AsBusrepairBillService extends MybatisBaseService detailsVos = detailsVo.getGoodsDetailsVos();
+ if (!detailsVos.isEmpty()) {
+ List goodsPdfVos = new ArrayList<>();
+ for (int i = 0; i < detailsVos.size(); i++) {
+ GoodsDetailsVo goodsDetailsVo = detailsVos.get(i);
+ SettleGoodsPdfVo goodsPdfVo = new SettleGoodsPdfVo();
+ BeanUtil.copyProperties(goodsDetailsVo, goodsPdfVo);
+ goodsPdfVo.setSortNo(String.valueOf(i + 1));
+ BigDecimal price = BigDecimal.ZERO;
+ BigDecimal amount = BigDecimal.ZERO;
+ if (StringUtils.isNotBlank(goodsDetailsVo.getPrice())) {
+ price = new BigDecimal(goodsDetailsVo.getPrice());
+ }
+ if (StringUtils.isNotBlank(goodsDetailsVo.getAmount())) {
+ amount = new BigDecimal(goodsDetailsVo.getAmount());
+ }
+ goodsPdfVos.add(goodsPdfVo);
+ if (subject.equals("保内")) {
+ sumMoney2.add(price);
+ }
+ if (subject.equals("保外")) {
+ sumMoney2.add(amount);
+ }
+ }
+ }
+ vo.setSumMoney2(sumMoney2.toString());
+ String caps2 = bigDecimalToLocalStr(sumMoney2);
+ vo.setCaps2(caps2);
+ if (StringUtils.isNotBlank(detailsVo.getSubsidyAmount())) {
+ vo.setSubsidyAmount(detailsVo.getSubsidyAmount());
+ }
+ if (StringUtils.isNotBlank(detailsVo.getOutAmount())) {
+ vo.setOutAmount(detailsVo.getOutAmount());
+ }
+ if (StringUtils.isNotBlank(detailsVo.getRescueAmount())) {
+ vo.setRescueAmount(detailsVo.getRescueAmount());
+ }
+ if (StringUtils.isNotBlank(detailsVo.getReceivableAmount())) {
+ vo.setReceivableAmount(detailsVo.getReceivableAmount());
+ }
+ if (StringUtils.isNotBlank(detailsVo.getActualAmount())) {
+ vo.setActualAmount(detailsVo.getActualAmount());
+ }
+ vo.setUserName(userName);
+ String path = createSettlePdf(vo, type, subject);
+ filePath = path;
}
return rb.success().setData(filePath);
}
+ private String createSettlePdf(SettlePdfVo vo, String type, String subject) {
+ String finalPath = "";
+ Map dataMap = new HashMap();
+ List> list = new ArrayList<>();
+ List> newList = new ArrayList<>();
+ boolean price0 = false;
+ if (subject.equals("保内") && type.equals("1")) {
+ price0 = true;
+ }
+ dataMap.put("company", vo.getCompany());
+ dataMap.put("dept", vo.getDept());
+ dataMap.put("settleTime", vo.getSettleTime());
+ dataMap.put("customer", vo.getCustomer());
+ dataMap.put("mobile", vo.getMobile());
+ dataMap.put("billNo", vo.getBillNo());
+ dataMap.put("billType", vo.getBillType());
+ dataMap.put("vehModel", vo.getVehModel());
+ dataMap.put("claimManufacturer", vo.getClaimManufacturer());
+ dataMap.put("claimNo", vo.getClaimNo());
+ dataMap.put("vinNo", vo.getVinNo());
+ dataMap.put("vehMark", vo.getVehMark());
+ dataMap.put("isKp", vo.getIsKp());
+ if (price0) {
+ dataMap.put("caps1", "");
+ dataMap.put("sumMoney1", "0");
+ dataMap.put("caps2", "");
+ dataMap.put("sumMoney2", "0");
+ dataMap.put("outAmount", "0");
+ dataMap.put("subsidyAmount", "0");
+ dataMap.put("rescueAmount", "0");
+ dataMap.put("receivableAmount", "0");
+ dataMap.put("actualAmount", "0");
+ } else {
+ dataMap.put("caps1", vo.getCaps1());
+ dataMap.put("sumMoney1", vo.getSumMoney1());
+ dataMap.put("caps2", vo.getCaps2());
+ dataMap.put("sumMoney2", vo.getSumMoney2());
+ dataMap.put("outAmount", vo.getOutAmount());
+ dataMap.put("subsidyAmount", vo.getSubsidyAmount());
+ dataMap.put("rescueAmount", vo.getRescueAmount());
+ dataMap.put("receivableAmount", vo.getReceivableAmount());
+ dataMap.put("actualAmount", vo.getActualAmount());
+ }
+ dataMap.put("userName", vo.getUserName());
+ List items = vo.getItems();
+ if (!items.isEmpty()) {
+ for (SettleItemPdfVo itemPdfVo : items) {
+ Map map = new HashMap<>();
+ map.put("sortNo", itemPdfVo.getSortNo());
+ map.put("serviceItem", itemPdfVo.getServiceItem());
+ map.put("serviceItemCode", itemPdfVo.getServiceItemCode());
+ map.put("serviceType", itemPdfVo.getServiceType());
+ map.put("hourPrice", itemPdfVo.getHourPrice());
+ map.put("hours", itemPdfVo.getHours());
+ if (price0) {
+ map.put("price", "0");
+ } else {
+ map.put("price", itemPdfVo.getPrice());
+ }
+ map.put("discount", itemPdfVo.getDiscount());
+ map.put("discountAmount", itemPdfVo.getDiscountAmount());
+ map.put("amount", itemPdfVo.getAmount());
+ map.put("repairerName", itemPdfVo.getRepairerName());
+ map.put("remarks", itemPdfVo.getRemarks());
+ list.add(map);
+ }
+ }
+ dataMap.put("list", list);
+ List goods = vo.getGoods();
+ if (!goods.isEmpty()) {
+ for (SettleGoodsPdfVo good : goods) {
+ Map map = new HashMap<>();
+ map.put("sortNo", good.getSortNo());
+ map.put("goodsSpuName", good.getGoodsSpuName());
+ map.put("goodsSkuCode", good.getGoodsSkuCode());
+ map.put("goodsSkuOwnSpec", good.getGoodsSkuOwnSpec());
+ map.put("unit", good.getUnit());
+ map.put("count", good.getCount());
+ if (price0) {
+ map.put("price", "0");
+ map.put("amount", "0");
+ } else {
+ map.put("price", good.getPrice());
+ map.put("amount", good.getAmount());
+ }
+ map.put("discount", good.getDiscount());
+ map.put("discountAmount", good.getDiscountAmount());
+ map.put("remarks", good.getRemarks());
+ map.put("operName", good.getOperName());
+ newList.add(map);
+ }
+ }
+ dataMap.put("newList", newList);
+ String temp = "/template/";
+ String targetPath = docPdfComponent.getUploadTemplateUrl();
+ String ftl = "";
+ boolean add = true;
+ if (StringUtils.isBlank(vo.getOutAmount()) &&
+ StringUtils.isBlank(vo.getSubsidyAmount()) &&
+ StringUtils.isBlank(vo.getRescueAmount())) {
+ add = false;
+ }
+ if (subject.equals("保内")) {
+ if (add) {
+ ftl = "ftl/baoneifujia.ftl";
+ } else {
+ ftl = "ftl/baonei.ftl";
+ }
+ } else if (subject.equals("保外")) {
+ if (add) {
+ ftl = "ftl/baowaifujia.ftl";
+ } else {
+ ftl = "ftl/baowai.ftl";
+ }
+ }
+ try {
+ //获取模板
+ InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(ftl);
+ //生成word文件名
+ String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+ long seconds = System.currentTimeMillis();
+ String typeName = dateStr + seconds + ".doc";
+ File file = new File(targetPath + "templateSettle" + seconds + ".ftl");
+ File dir = new File(targetPath);
+ WordConvertUtils.inputStreamToFile(inputStream, file);
+ WordConvertUtils.creatWord1(dataMap, file, targetPath, typeName, dir);
+ //新生成的word路径
+ String wordPath = targetPath + typeName;
+ String pdfName = "结算单" + dateStr + seconds + ".pdf";
+ WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
+ finalPath = temp + pdfName;
+ } catch (NoClassDefFoundError e) {
+ e.printStackTrace();
+ finalPath = targetPath;
+ }
+ return finalPath;
+ }
+
public static String bigDecimalToLocalStr(BigDecimal bigDecimal) {
String[] chinese = new String[]{"", "拾", "佰", "仟", "万", "拾", "佰", "仟", "亿", "拾", "佰", "仟", "万"};
String[] numChinese = new String[]{"零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"};
@@ -1647,4 +1920,48 @@ public class AsBusrepairBillService extends MybatisBaseService notConfirmList(PagerQuery pagerQuery) {
+ GoodsReceiveQuery query = pagerQuery.getParams();
+ QueryWrapper qw = new QueryWrapper<>();
+ if (query != null) {
+ //工单编号
+ if (StringUtils.isNotBlank(query.getUserSid())) {
+ qw.eq("d.operUserSid", query.getUserSid());
+ }
+ if (StringUtils.isNotBlank(query.getName())) {
+ qw.and(wrapper -> wrapper.like("b.billNo", query.getName())
+ .or().like("b.customerName", query.getName())
+ .or().like("v.vehMark", query.getName())
+ );
+ }
+ qw.eq("d.state", 1);
+ }
+ IPage page = PagerUtil.queryToPage(pagerQuery);
+ IPage pagging = baseMapper.notConfirmList(page, qw);
+ List records = pagging.getRecords();
+ if (!records.isEmpty()) {
+ for (GoodsReceiveVo record : records) {
+ List list = baseMapper.selGoodsReceiveByBillSid(record.getSid());
+ if (!list.isEmpty()) {
+ record.setList(list);
+ }
+ }
+ }
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public void submitList(GoodsReceiveSubmit query) {
+ List list = query.getList();
+ if (!list.isEmpty()) {
+ for (String s : list) {
+ AsBusrepairInventorybillDetail detail = asBusrepairInventorybillDetailService.fetchBySid(s);
+ if (null != detail) {
+ detail.setReceivedTime(new Date());
+ detail.setState(2);
+ asBusrepairInventorybillDetailService.updateById(detail);
+ }
+ }
+ }
+ }
}
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 5b3cf7070e..e79d0d9378 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
@@ -26,6 +26,7 @@ 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.portal.sysuser.SysUserFeign;
+import com.yxt.anrui.as.feign.wms.wmsInventory.WmsInventory;
import com.yxt.anrui.as.feign.wms.wmsInventory.WmsInventoryFeign;
import com.yxt.anrui.as.feign.wms.wmsInventory.WmsUpdateCountQuery;
import com.yxt.anrui.as.feign.wms.wmsinventorybill.WmsInventoryBillDetailDto;
@@ -279,8 +280,29 @@ public class AsBusrepairInventorybillService extends MybatisBaseService 0) {
+ detail.setIsTaxRate(1);
+ } else {
+ detail.setIsTaxRate(0);
+ }
+ } else {
+ detail.setIsTaxRate(0);
+ }
+ }
+ if (StringUtils.isNotBlank(dto.getWarehouseManager())) {
+ detail.setOperName(dto.getWarehouseManager());
+ }
+ if (StringUtils.isNotBlank(dto.getWarehouseManagerSid())) {
+ detail.setOperUserSid(dto.getWarehouseManagerSid());
+ }
+ if (StringUtils.isNotBlank(sDto.getPrice())) {
+ detail.setGoodsDetailsPrice(new BigDecimal(sDto.getPrice()));
+ }
asBusrepairInventorybillDetailService.insert(detail);
-
WmsUpdateCountQuery countQuery = new WmsUpdateCountQuery();
countQuery.setSid(sDto.getInventorySid());
countQuery.setCount(new BigDecimal(sDto.getCount()));
@@ -382,6 +404,9 @@ public class AsBusrepairInventorybillService extends MybatisBaseService fetchEntityBySid(@RequestParam("sid") String sid);
}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeignFallback.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeignFallback.java
index ebcdff5c0f..b9ce43bd4c 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeignFallback.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeignFallback.java
@@ -56,4 +56,9 @@ public class WmsInventoryFeignFallback implements WmsInventoryFeign {
public ResultBean updateInventoryCount(WmsUpdateCountQuery query) {
return null;
}
+
+ @Override
+ public ResultBean fetchEntityBySid(String sid) {
+ return null;
+ }
}
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
index dee0957019..61b7ef747e 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
@@ -511,12 +511,18 @@ public class PmsPurchaseBillService extends MybatisBaseService wmsAnsBillDetailList = new ArrayList<>();
+ @ApiModelProperty("采购单税率")
+ private String taxRate;
}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBill.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBill.java
index 4e57cc899a..e79980d7b6 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBill.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBill.java
@@ -4,6 +4,7 @@ import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -61,4 +62,6 @@ public class WmsAnsBill extends BaseEntity {
private String manufactorBillTypeValue;
@ApiModelProperty("厂家订单类型key")
private String manufactorBillTypeKey;
+ @ApiModelProperty("采购单税率")
+ private BigDecimal taxRate;
}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java
index dbe7f01027..eb1ec02242 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java
@@ -4,6 +4,7 @@ import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsBillDetailDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -64,4 +65,6 @@ public class WmsAnsBillDto {
@ApiModelProperty("厂家订单类型key")
private String manufactorBillTypeKey;
private List wmsAnsBillDetailList = new ArrayList<>();
+ @ApiModelProperty("采购单税率")
+ private String taxRate;
}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventory.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventory.java
index db9d131027..969e616e77 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventory.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventory.java
@@ -46,6 +46,8 @@ public class WmsInventory extends BaseEntity {
private BigDecimal freezeCount;
@ApiModelProperty("入库单价")
private BigDecimal cost;
+ @ApiModelProperty("税率")
+ private BigDecimal taxRate;
@ApiModelProperty("仓库sid")
private String warehouseSid;
@ApiModelProperty("仓库名称")
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDto.java
index c0e433c499..3db5816633 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDto.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDto.java
@@ -104,7 +104,7 @@ public class WmsInventoryRecordDto implements Dto {
@ApiModelProperty("入库单价")
private String cost;
@ApiModelProperty("税率")
- private String tax;
+ private String taxRate;
@ApiModelProperty("入库金额")
private String amount;
@ApiModelProperty("经办人sid")
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java
index be2d7643e0..49704bfbb7 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java
@@ -351,6 +351,9 @@ public class WmsInventoryRecordService extends MybatisBaseService {
List selGoodsListCountBySpuSidAndSouceSid(@Param("goodsSpuSid")String goodsSpuSid, @Param("sourceBillSid")String sourceBillSid);
List getUpShlefListBySid(@Param("sid") String sid);
+
+ String selallotmentNumByReceiptDetailSid(String detailsSid);
}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml
index e73ac5b30e..c13f64aa7c 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml
@@ -85,4 +85,12 @@
from wms_shelf_bill wrb
where wrb.sourceBillSid = #{sid}
+
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillQuery.java
index f6a9743658..57d15c50bf 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillQuery.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillQuery.java
@@ -34,5 +34,6 @@ public class WmsReceiptBillQuery implements Query {
private String orgPath;
@ApiModelProperty("用户sid")
private String userSid;
-
+ @ApiModelProperty("分配状态")
+ private String distributeType;
}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java
index 35e9ae410d..b1a75fbdb5 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java
@@ -127,6 +127,10 @@ public class WmsReceiptBillService extends MybatisBaseService pcList2 = wmsReceiptBillDetailBatchService.getDetailsInit(sid, wmsReceiptBillDetailDto2.getDetailsSid());
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java
index 64f61ea2d0..dc8518b534 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java
@@ -70,4 +70,6 @@ public class WmsReceiptBillDetailDto2 {
@ApiModelProperty("有效天数")
private String shelfLife;
+ @ApiModelProperty("已分配数量 ")
+ private String allotmentNum;
}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailVo.java
index d8592fbb3b..4a1b5bb357 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailVo.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailVo.java
@@ -66,4 +66,7 @@ public class WmsReceiptBillDetailVo {
@ApiModelProperty("预约数量（采购订单数量）")
private String orderCount;
+
+
+
}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java
index 7ffa831789..9c6f608066 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java
@@ -18,6 +18,7 @@ import com.yxt.wms.biz.base.wmswarehouserack.WmsHouseInfoVo;
import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack;
import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService;
import com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBill;
+import com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBillService;
import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsListDetailsVo;
import com.yxt.wms.biz.inventory.wmsgoodstag.WmsGoodsTag;
import com.yxt.wms.biz.inventory.wmsgoodstag.WmsGoodsTagService;
@@ -101,7 +102,8 @@ public class WmsShelfBillService extends MybatisBaseService listPage(PagerQuery pq) {
WmsShelfBillQuery query = pq.getParams();
@@ -777,8 +779,16 @@ public class WmsShelfBillService extends MybatisBaseService
@@ -26,7 +26,7 @@
至
+
@@ -84,7 +84,7 @@
-
@@ -102,7 +102,7 @@
工单查询列表
+ 维修单查询列表