需求

src/main/java/com/zfire/mall/manager/bean/k3/KingDeePurchaseStockInData.java

@@ -16,6 +16,6 @@ public class KingDeePurchaseStockInData extends KingDeePurchaseStockIn {
 
 
     @ApiModelProperty(value = "绑定入库单")
-    private List<KingDeePurchaseStockInBean> kingDeePurchaseStockInItems;
+    private List<KingDeePurchaseStockInItem> kingDeePurchaseStockInItems;
 
 }

src/main/java/com/zfire/mall/manager/bean/k3/KingDeeWalletVO.java

@@ -23,6 +23,9 @@ public class KingDeeWalletVO   {
     @ApiModelProperty(value = "钱包名称")
     private String name;
 
+    @ApiModelProperty(value = "禁用状态 A=正常 B=禁用")
+    private String forbidStatus;
+
 
     @ApiModelProperty(value = "创建人")
     @TableField(fill = FieldFill.INSERT)

src/main/java/com/zfire/mall/manager/bean/k3/v2/KingDeePurchaseStockInVO.java

@@ -66,13 +66,6 @@ public class KingDeePurchaseStockInVO {
     @ApiModelProperty(value = "审核日期")
     private Date approveDate;
 
-    @ZfireField(tbName = "a")
-    @ApiModelProperty(value = "作废人")
-    private String cancellerId;
-
-    @ZfireField(tbName = "a")
-    @ApiModelProperty(value = "作废日期")
-    private Date cancelDate;
 
     @ZfireField(tbName = "a")
     @ApiModelProperty(value = "供货方")
@@ -94,14 +87,6 @@ public class KingDeePurchaseStockInVO {
     @ApiModelProperty(value = "更新人")
     private String updateBy;
 
-    @ZfireField(tbName = "a")
-    @ApiModelProperty(value = "同步时间")
-    private Date syncTime;
-
-    @ZfireField(tbName = "a")
-    @ApiModelProperty(value = "订单状态")
-    private String fdDocumentStatus;
-
     @ZfireField(tbName = "b", hide = true)
     @ApiModelProperty(value = "实体主键")
     private String entryId;

src/main/java/com/zfire/mall/manager/bean/k3/v2/KingTransferVO.java

@@ -14,7 +14,7 @@ import java.util.Date;
 @ApiModel
 public class KingTransferVO {
 
-    @ZfireField(tbName = "a")
+    @ZfireField(tbName = "a", hide = true)
     @ApiModelProperty(value = "id")
     private String id;
 
@@ -42,9 +42,6 @@ public class KingTransferVO {
     @ApiModelProperty(value = "调拨类型")
     private K3TransferTypeEnum transferBizType;
 
-    @ZfireField(tbName = "a")
-    @ApiModelProperty(value = "作废状态")
-    private K3CommonStatusEnum cancelStatus;
 
     @ZfireField(tbName = "a")
     @ApiModelProperty(value = "备注")
@@ -59,14 +56,6 @@ public class KingTransferVO {
     private Date approveDate;
 
     @ZfireField(tbName = "a")
-    @ApiModelProperty(value = "作废人")
-    private String cancellerId;
-
-    @ZfireField(tbName = "a")
-    @ApiModelProperty(value = "作废日期")
-    private Date cancelDate;
-
-    @ZfireField(tbName = "a")
     @ApiModelProperty(value = "单据类型")
     private String billType;
 
@@ -74,9 +63,6 @@ public class KingTransferVO {
     @ApiModelProperty(value = "单据状态")
     private String documentStatus;
 
-    @ZfireField(tbName = "a")
-    @ApiModelProperty(value = "同步时间")
-    private Date syncTime;
 
     @ZfireField(tbName = "a")
     @ApiModelProperty(value = "创建时间")
@@ -103,7 +89,7 @@ public class KingTransferVO {
     @ApiModelProperty(value = "实体主键")
     private String entryId;
 
-    @ZfireField(tbName = "b")
+    @ZfireField(tbName = "b", hide = true)
     @ApiModelProperty(value = "物料id")
     private String materialId;
 
@@ -115,11 +101,11 @@ public class KingTransferVO {
     @ApiModelProperty(value = "物料名称")
     private String materialName;
 
-    @ZfireField(tbName = "b")
+    @ZfireField(tbName = "b", hide = true)
     @ApiModelProperty(value = "调出仓库")
     private String srcStockId;
 
-    @ZfireField(tbName = "b")
+    @ZfireField(tbName = "b", hide = true)
     @ApiModelProperty(value = "调入仓库")
     private String destStockId;
 
@@ -152,14 +138,6 @@ public class KingTransferVO {
     private BigDecimal consignPrice;
 
     @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "调出仓位")
-    private String srcStockLocId;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "调入仓位")
-    private String destStockLocId;
-
-    @ZfireField(tbName = "b")
     @ApiModelProperty(value = "辅助属性")
     private String auxPropId;
 

src/main/java/com/zfire/mall/manager/bean/listV2/SaleTypeVO.java

@@ -13,7 +13,7 @@ import java.util.Date;
 @Data
 public class SaleTypeVO {
 
-    @ZfireField(hide = true,pk = true)
+    @ZfireField(hide = true)
     private String id;
     @ApiModelProperty("销售类型编码")
     private String saleCode;

src/main/java/com/zfire/mall/manager/bean/listV2/WalletSaleTypeRelaVO.java

@@ -16,7 +16,7 @@ import java.util.Date;
 @Data
 public class WalletSaleTypeRelaVO {
 
-    @ZfireField(hide = true,pk = true)
+    @ZfireField(hide = true)
     private String walletRebateSaleTypeId;
     @ZfireField(tbName = "c")
     @ApiModelProperty("销售类型编码")

src/main/java/com/zfire/mall/manager/bean/stock/KingDeeOtherStockInVO.java

@@ -71,22 +71,9 @@ public class KingDeeOtherStockInVO  {
     private Date approveDate;
 
     @ZfireField(tbName = "kdpso")
-    @ApiModelProperty(value = "作废人")
-    private String cancellerId;
-
-    @ZfireField(tbName = "kdpso")
-    @ApiModelProperty(value = "作废日期")
-    private Date cancelDate;
-
-    @ZfireField(tbName = "kdpso")
     @ApiModelProperty(value = "备注")
     private String note;
 
-    @ZfireField(tbName = "kdpso")
-    @ApiModelProperty(value = "订单状态")
-    private String fdDocumentStatus;
-
-
     @ZfireField(tbName = "kdpsoi")
     @ApiModelProperty(value = "物料编码")
     private String materialNumber;

src/main/java/com/zfire/mall/manager/controller/wallet/WalletController.java

@@ -276,7 +276,7 @@ public class WalletController {
         return ResponseHelper.success(list);
     }
 
-    @GetMapping("/detail")
+    @PostMapping("/detail")
     @ApiOperation(value = "现金钱包详情")
     public ResponseHelper<KingDeeWallet> KingDeeDetail(
             @ApiParam(value = "现金钱包id",required = true) @RequestParam(required = true) String walletId

src/main/java/com/zfire/mall/manager/logic/k3/K3OtherStockInLogic.java

@@ -3,10 +3,12 @@ package com.zfire.mall.manager.logic.k3;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.zfire.mall.manager.bean.admin.AdminUserCom;
 import com.zfire.mall.manager.bean.k3.KingDeeOtherStockInAdd;
 import com.zfire.mall.manager.bean.k3.KingDeeOtherStockInDetail;
 import com.zfire.mall.manager.enums.ExamineStatusEnum;
 import com.zfire.mall.manager.exception.RemoteServiceException;
+import com.zfire.mall.manager.logic.common.CommonLogic;
 import com.zfire.mall.manager.logic.stock.StockCommonLogic;
 import com.zfire.mall.manager.plus.entity.*;
 import com.zfire.mall.manager.plus.service.KingDeeOtherStockInItemService;
@@ -44,11 +46,15 @@ public class K3OtherStockInLogic {
     @Autowired
     StockCorrespondService stockCorrespondService;
 
+    @Autowired
+    CommonLogic commonLogic;
+
 
     public void add(KingDeeOtherStockInAdd kingDeePurchaseStockInAdd) {
         kingDeePurchaseStockInAdd.setId(IdWorker.getIdStr());
         kingDeePurchaseStockInAdd.setBillNo(kingDeePurchaseStockInAdd.getId());
         kingDeePurchaseStockInAdd.setCancelStatus(ExamineStatusEnum.WAIT.getKey());
+        kingDeePurchaseStockInAdd.setFDate(new Date());
         kingDeePurchaseStockInAdd.insert();
 
         List<StockCorrespond> list = stockCorrespondService.lambdaQuery().list();
@@ -91,8 +97,12 @@ public class K3OtherStockInLogic {
 
     @Transactional(rollbackFor = Exception.class)
     public void examine(String billNo, String cancelStatus) {
+        AdminUserCom adminUser = commonLogic.getAdminUser();
         KingDeeOtherStockIn kingDeeOtherStockIn = kingDeeOtherStockInService.getById(billNo);
 
+        kingDeeOtherStockIn.setApproveDate(new Date());
+        kingDeeOtherStockIn.setApproverId(adminUser.getNickName());
+
         kingDeeOtherStockIn.setCancelStatus(cancelStatus);
         kingDeeOtherStockIn.updateById();
 

src/main/java/com/zfire/mall/manager/logic/k3/K3PurchaseStockInLogic.java

@@ -1,11 +1,13 @@
 package com.zfire.mall.manager.logic.k3;
 
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zfire.mall.manager.bean.ExcelData;
+import com.zfire.mall.manager.bean.admin.AdminUserCom;
 import com.zfire.mall.manager.bean.direct.DirectTransferList;
 import com.zfire.mall.manager.bean.k3.*;
 import com.zfire.mall.manager.bean.stock.KingDeePurchaseStockInAdd;
@@ -13,6 +15,7 @@ import com.zfire.mall.manager.commonmapper.manage.TransferMapper;
 import com.zfire.mall.manager.constant.KingDeeCons;
 import com.zfire.mall.manager.enums.ExamineStatusEnum;
 import com.zfire.mall.manager.exception.RemoteServiceException;
+import com.zfire.mall.manager.logic.common.CommonLogic;
 import com.zfire.mall.manager.logic.stock.StockCommonLogic;
 import com.zfire.mall.manager.plus.entity.*;
 import com.zfire.mall.manager.plus.service.*;
@@ -53,6 +56,9 @@ public class K3PurchaseStockInLogic {
     StockCorrespondService stockCorrespondService;
 
 
+    @Autowired
+    CommonLogic commonLogic;
+
 //    public void allSync(String orgId, String orgNumber, String startTime, String endTime) throws Exception {
 //        // 调用入库单接口
 //        RequestApiBean request = k3Logic.getInstance(orgId, orgNumber, KingDeeCons.PURCHASE_IN_STOCK, startTime, endTime);
@@ -94,7 +100,14 @@ public class K3PurchaseStockInLogic {
     }
 
     public KingDeePurchaseStockInData detail(String id) {
-        return transferMapper.detailStockIn(id);
+        KingDeePurchaseStockIn kingDeePurchaseStockIn = kingDeePurchaseStockInService.getById(id);
+
+        KingDeePurchaseStockInData kingDeePurchaseStockInData = BeanUtil.toBean(kingDeePurchaseStockIn, KingDeePurchaseStockInData.class);
+
+        List<KingDeePurchaseStockInItem> kingDeePurchaseStockInItems = kingDeePurchaseStockInItemService.lambdaQuery().eq(KingDeePurchaseStockInItem::getBillNo, id).list();
+
+        kingDeePurchaseStockInData.setKingDeePurchaseStockInItems(kingDeePurchaseStockInItems);
+        return kingDeePurchaseStockInData;
     }
 
     /**
@@ -141,6 +154,7 @@ public class K3PurchaseStockInLogic {
         kingDeePurchaseStockInAdd.setId(IdWorker.getIdStr());
         kingDeePurchaseStockInAdd.setBillNo(kingDeePurchaseStockInAdd.getId());
         kingDeePurchaseStockInAdd.setCancelStatus(ExamineStatusEnum.WAIT.getKey());
+        kingDeePurchaseStockInAdd.setFDate(new Date());
 
         kingDeePurchaseStockInAdd.insert();
 
@@ -183,9 +197,12 @@ public class K3PurchaseStockInLogic {
 
     @Transactional(rollbackFor = Exception.class)
     public void examine(String billNo, String cancelStatus) {
+        AdminUserCom adminUser = commonLogic.getAdminUser();
         KingDeePurchaseStockIn kingDeePurchaseStockIn = kingDeePurchaseStockInService.getById(billNo);
 
         kingDeePurchaseStockIn.setCancelStatus(cancelStatus);
+        kingDeePurchaseStockIn.setApproveDate(new Date());
+        kingDeePurchaseStockIn.setApproverId(adminUser.getNickName());
         kingDeePurchaseStockIn.updateById();
 
 

src/main/java/com/zfire/mall/manager/logic/k3/K3PurchaseStockOutLogic.java

@@ -2,10 +2,12 @@ package com.zfire.mall.manager.logic.k3;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.zfire.mall.manager.bean.admin.AdminUserCom;
 import com.zfire.mall.manager.bean.k3.KingDeePurchaseStockOutAdd;
 import com.zfire.mall.manager.bean.k3.KingDeePurchaseStockOutData;
 import com.zfire.mall.manager.enums.ExamineStatusEnum;
 import com.zfire.mall.manager.exception.RemoteServiceException;
+import com.zfire.mall.manager.logic.common.CommonLogic;
 import com.zfire.mall.manager.logic.stock.StockCommonLogic;
 import com.zfire.mall.manager.plus.entity.*;
 import com.zfire.mall.manager.plus.service.KingDeePurchaseStockOutItemService;
@@ -44,10 +46,14 @@ public class K3PurchaseStockOutLogic {
     @Autowired
     StockCommonLogic stockCommonLogic;
 
+    @Autowired
+    CommonLogic commonLogic;
+
     public void add(KingDeePurchaseStockOutAdd kingDeePurchaseStockInAdd) {
         kingDeePurchaseStockInAdd.setId(IdWorker.getIdStr());
         kingDeePurchaseStockInAdd.setBillNo(kingDeePurchaseStockInAdd.getId());
         kingDeePurchaseStockInAdd.setCancelStatus(ExamineStatusEnum.WAIT.getKey());
+        kingDeePurchaseStockInAdd.setFDate(new Date());
         kingDeePurchaseStockInAdd.insert();
 
         List<StockCorrespond> list = stockCorrespondService.lambdaQuery().list();
@@ -93,8 +99,13 @@ public class K3PurchaseStockOutLogic {
 
     @Transactional(rollbackFor = Exception.class)
     public void examine(String billNo, String cancelStatus) {
+        AdminUserCom adminUser = commonLogic.getAdminUser();
         KingDeePurchaseStockOut kingDeePurchaseStockOut = kingDeePurchaseStockOutService.getById(billNo);
         kingDeePurchaseStockOut.setCancelStatus(cancelStatus);
+
+        kingDeePurchaseStockOut.setApproveDate(new Date());
+
+        kingDeePurchaseStockOut.setApproverId(adminUser.getNickName());
         kingDeePurchaseStockOut.updateById();
 
         if (cancelStatus.equals(ExamineStatusEnum.OK.getKey())) {

src/main/java/com/zfire/mall/manager/logic/wallet/WalletLogic.java

@@ -1984,12 +1984,32 @@ public class WalletLogic {
 
 
     public void addWallet(KingDeeWallet kingDeeWallet) {
+        if (StringUtils.isEmpty(kingDeeWallet.getNumber()))
+            throw new RemoteServiceException("钱包编码不能为空");
+
+        if (kingDeeWalletService.lambdaQuery().eq(KingDeeWallet::getNumber,kingDeeWallet.getNumber()).count() > 0) {
+            throw new RemoteServiceException("钱包编码存在");
+        }
+
+        if (kingDeeWalletService.lambdaQuery().eq(KingDeeWallet::getName,kingDeeWallet.getName()).count() > 0) {
+            throw new RemoteServiceException("钱包名称存在");
+        }
         kingDeeWallet.insert();
 
         walletCommonMapper.initCustomerWallet(null);
     }
 
     public void updateWallet(KingDeeWallet kingDeeWallet) {
+
+        if (kingDeeWalletService.lambdaQuery().eq(KingDeeWallet::getNumber,kingDeeWallet.getNumber())
+                .ne(KingDeeWallet::getId,kingDeeWallet.getId()).count() > 0) {
+            throw new RemoteServiceException("钱包编码存在");
+        }
+
+        if (kingDeeWalletService.lambdaQuery().eq(KingDeeWallet::getName,kingDeeWallet.getName())
+                .ne(KingDeeWallet::getId,kingDeeWallet.getId()).count() > 0) {
+            throw new RemoteServiceException("钱包名称存在");
+        }
         kingDeeWallet.updateById();
 
     }

src/main/resources/mapper/StockMapper.xml

@@ -754,7 +754,7 @@
         ${ex.query}
 
         <if test="ex.orderBy == null or ex.orderBy ==''">
-            order by kdpso.sync_time DESC
+            order by kdpso.create_time DESC
         </if>
         ${ex.orderBy}
     </select>