粮农

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/PurchaseOrderController.java

@@ -105,5 +105,14 @@ public class PurchaseOrderController {
     public String editPurchaseOrder(@RequestBody PurchaseOrder purchaseOrder){
         return purchaseOrderService.editPurchaseOrder(purchaseOrder);
     }
+    /**
+     * 我的合同列表
+     * @param purchaseOrder
+     * @return
+     */
+    @GetMapping("/selectPurchaseOrderApp")
+    public Page<PurchaseOrder> selectPurchaseOrderApp(PurchaseOrder purchaseOrder) {
+        return purchaseOrderService.selectPurchaseOrderApp(purchaseOrder);
+    }
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PurchaseOrder.java

@@ -47,6 +47,10 @@ public class PurchaseOrder extends BaseModel<PurchaseOrder> {
      * 合同编号
      */
     private String contractNo;
+    /**
+     * 订单类型
+     */
+    private String orderType;
     /**
      * 采购计划
      */
@@ -228,6 +232,7 @@ public class PurchaseOrder extends BaseModel<PurchaseOrder> {
     /**
      * 计划包装方式
      */
+    @TableField(exist = false)
     private String planPackingType;
 
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/SaleOrder.java

@@ -51,6 +51,10 @@ public class SaleOrder extends BaseModel<SaleOrder> {
      * 合同编号
      */
     private String contractNo;
+    /**
+     * 订单类型
+     */
+    private String orderType;
     /**
      * 销售计划
      */
@@ -221,6 +225,7 @@ public class SaleOrder extends BaseModel<SaleOrder> {
     /**
      * 计划包装方式
      */
+    @TableField(exist = false)
     private String planPackingType;
 
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IPurchaseOrderService.java

@@ -69,5 +69,11 @@ public interface IPurchaseOrderService extends IService<PurchaseOrder> {
      * @param purchaseOrder
      */
     String editPurchaseOrder(PurchaseOrder purchaseOrder);
+    /**
+     * 我的合同列表
+     * @param purchaseOrder
+     * @return
+     */
+    Page<PurchaseOrder> selectPurchaseOrderApp(PurchaseOrder purchaseOrder);
 
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PurchaseOrderServiceImpl.java

@@ -356,6 +356,7 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
     public String insertPurchaseOrder(PurchaseOrder purchaseOrder) {
         //新增主键id
         purchaseOrder.setId(IdGenerator.generateUUID());
+        purchaseOrder.setOrderType("采购");
         // 操作主表数据
         boolean one = this.insert(purchaseOrder);
         boolean isStartWorkflow = StringUtils.isBlank(purchaseOrder.getWorkflowId());
@@ -429,5 +430,29 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
             return "NG";
         }
     }
+
+    /**
+     * 我的合同列表
+     * @param purchaseOrder
+     * @return
+     */
+    @Override
+    public Page<PurchaseOrder> selectPurchaseOrderApp(PurchaseOrder purchaseOrder) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (purchaseOrder.getCurrentPage() - 1)
+                * purchaseOrder.getPageSize());
+        pageView.put("commonId", purchaseOrder.getCommonId());
+        pageView.put("pageSize", purchaseOrder.getPageSize());
+        pageView.put("currentPage", purchaseOrder.getCurrentPage());
+        // 查询我的合同总数
+        Integer dataCount = baseMapper.getCountByCondition(pageView);
+        List<PurchaseOrder> dataList = baseMapper.getListByCondition(pageView);
+        Page<PurchaseOrder> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(purchaseOrder.getCurrentPage());
+        page.setSize(purchaseOrder.getPageSize());
+        return page;
+    }
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SaleOrderServiceImpl.java

@@ -316,6 +316,7 @@ public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder
     public String insertSaleOrder(SaleOrder saleOrder) {
         //新增主键id
         saleOrder.setId(IdGenerator.generateUUID());
+        saleOrder.setOrderType("销售");
         // 操作主表数据
         boolean one = this.insert(saleOrder);
         boolean isStartWorkflow = StringUtils.isBlank(saleOrder.getWorkflowId());