采购单调试修改

oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java

@@ -26,7 +26,7 @@ public class SysStaffOrgRest {
     @GetMapping("/selAllByOrgSidPath")
     @ResponseBody
     @ApiOperation("根据组织全路径查询当前部门下的所有员工")
-    public ResultBean<List<SysStaffOrgByUserVo>> selAllByOrgSidPath(String orgSidPath) {
+    public ResultBean<List<SysStaffOrgByUserVo>> selAllByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath) {
         return sysStaffOrgService.selAllByOrgSidPath(orgSidPath);
     }
 }

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java

@@ -80,9 +80,8 @@ public class PurchaseBillDetailsVo implements Vo {
     private String purchaserSid; // 采购员sid（单选）
     @ApiModelProperty("采购员姓名")
     private String purchaserName; // 采购员姓名
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("预计到货日期")
-    private Date deliveryDate; // 预计到货日期
+    private String deliveryDate;
     @ApiModelProperty("仓库sid")
     private String wareHouseSid;
     @ApiModelProperty("仓库名称")

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java

@@ -80,9 +80,8 @@ public class PurchaseBillDto implements Dto {
     private String purchaserSid; // 采购员sid（单选）
     @ApiModelProperty("采购员姓名")
     private String purchaserName; // 采购员姓名
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("预计到货日期")
-    private Date deliveryDate; // 预计到货日期
+    private String deliveryDate;
     @ApiModelProperty("仓库sid")
     private String wareHouseSid;
     @ApiModelProperty("仓库名称")

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.xml

@@ -5,7 +5,7 @@
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectNum" resultType="java.lang.String">
 		select RIGHT (billNo, 4)
-		from pms_purchase_bill
+		from purchase_bill
 		where billNo LIKE concat(#{billNo}, '%')
 		order by billNo desc
 				limit 1

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java

@@ -138,7 +138,6 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
             wmsAnsBillDto.setSupplierName(dto.getSupplierName());
             wmsAnsBillDto.setGoodsOwnerSid("");
             wmsAnsBillDto.setGoodsOwner("");
-            wmsAnsBillDto.setDeliveryDate(dto.getDeliveryDate());
             wmsAnsBillDto.setUseOrgSid(dto.getUseOrgSid());
             wmsAnsBillDto.setCreateOrgSid(dto.getCreateOrgSid());
             List<WarehouseAnsBillDetailDto> wmsAnsBillDetailDtos = new ArrayList<>();

oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java

@@ -92,9 +92,8 @@ public class PurchaseBillDetailDetailsVo implements Vo {
     private BigDecimal amount; // 采购金额
     @ApiModelProperty("采购周期")
     private Integer cycle; // 采购周期
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("预期到货日期")
-    private Date deliveryDate; // 预期到货日期
+    private String deliveryDate;
 
     @ApiModelProperty("总税额")
     private BigDecimal taxAmount;

oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java

@@ -92,9 +92,8 @@ public class PurchaseBillDetailDto implements Dto {
     private BigDecimal amount; // 采购金额
     @ApiModelProperty("采购周期")
     private Integer cycle; // 采购周期
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("预期到货日期")
-    private Date deliveryDate; // 预期到货日期
+    private String deliveryDate; // 预期到货日期
 
     @ApiModelProperty("总税额")
     private BigDecimal taxAmount;

oms/src/main/java/com/yxt/oms/feign/portal/sysstafforg/SysStaffOrgFeign.java

@@ -29,5 +29,5 @@ public interface SysStaffOrgFeign {
     @GetMapping("/selAllByOrgSidPath")
     @ResponseBody
     @ApiOperation("根据组织全路径查询当前部门下的所有员工")
-    public ResultBean<List<SysStaffOrgByUserVo>> selAllByOrgSidPath(String orgSidPath);
+    public ResultBean<List<SysStaffOrgByUserVo>> selAllByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath);
 }