安品APP接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/anpin/AnPinApp.java

@@ -0,0 +1,81 @@
+package com.ruoyi.web.controller.anpin;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.ruoyi.basicData.domain.TCustomerContact;
+import com.ruoyi.basicData.service.ITCustomerContactService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
+import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
+import com.ruoyi.warehouseBusiness.service.ITWarehousebillsfeesService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 安品APP接口
+ */
+@RestController
+@RequestMapping("/anPin/anPinApp")
+public class AnPinApp extends BaseController {
+    @Autowired
+    private ITWarehouseBillsService tWarehousebillsService;
+    @Autowired
+    private ITWarehousebillsfeesService itWarehousebillsfeesService;
+    @Autowired
+    private ITCustomerContactService tCustomerContactService;
+    /**
+     * 查询仓库主(出入库)列表
+     */
+    @GetMapping("/supplier")
+    public TableDataInfo supplier(TWarehouseBills tWarehousebills) {
+        List<TWarehouseBills> list = new ArrayList<>();
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        tWarehousebills.setfBillstatus(6L);
+        //获取客户ID
+        TCustomerContact tCustomerContact = new TCustomerContact();
+        tCustomerContact.setfTel(loginUser.getUser().getPhonenumber());
+        List<TCustomerContact> tCustomerContacts = tCustomerContactService.selectTCustomerContactList(tCustomerContact);
+        if (CollectionUtils.isEmpty(tCustomerContacts)){
+            return  getDataTable(list);
+        }else {
+            startPage();
+            tWarehousebills.setfCorpid(tCustomerContacts.get(0).getfPid());
+            list = tWarehousebillsService.selectAnPinList(tWarehousebills);
+            return getDataTable(list);
+        }
+    }
+    @GetMapping("/list")
+    public TableDataInfo list(TWarehouseBills tWarehousebills) {
+        startPage();
+        List<TWarehouseBills> list = tWarehousebillsService.selectAnPinList(tWarehousebills);
+        return getDataTable(list);
+    }
+    /**
+     * 获取仓库主(出入库)详细信息
+     */
+    @GetMapping(value = "/{fId}")
+    public AjaxResult getInfo(@PathVariable("fId") Long fId) {
+        return AjaxResult.success(tWarehousebillsService.selectAnPinById(fId));
+    }
+
+    /**
+     * 供应商接单或拒绝
+     * @param tWarehouseBills
+     * @return
+     */
+    @PostMapping("/updateMessage")
+    public AjaxResult updateMessage(@RequestBody TWarehouseBills tWarehouseBills){
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        tWarehouseBills.setUpdateBy(loginUser.getUser().getUserName());
+        return toAjax(tWarehousebillsService.updateTWarehousebills(tWarehouseBills));
+    }
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehouseBills.java

@@ -532,6 +532,13 @@ public class TWarehouseBills extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "箱使日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date freeContainerDate;
+    /** 是否接单 0 待接单 1 已接单 2拒绝 */
+    @Excel(name = "是否接单 0 待接单 1 已接单 2拒绝")
+    private Integer fTakeOrders;
+
+    /** 拒绝理由 */
+    @Excel(name = "拒绝理由")
+    private String fReason;
 
     //起运港中文名
     private String loadportidName;
@@ -622,6 +629,22 @@ public class TWarehouseBills extends BaseEntity {
     //开始结束月
     private List<Long> monthList;
 
+    public Integer getfTakeOrders() {
+        return fTakeOrders;
+    }
+
+    public void setfTakeOrders(Integer fTakeOrders) {
+        this.fTakeOrders = fTakeOrders;
+    }
+
+    public String getfReason() {
+        return fReason;
+    }
+
+    public void setfReason(String fReason) {
+        this.fReason = fReason;
+    }
+
     public Date getFreeContainerDate() {
         return freeContainerDate;
     }
@@ -1842,6 +1865,8 @@ public class TWarehouseBills extends BaseEntity {
                 ", fPrintLog=" + fPrintLog +
                 ", fPrint=" + fPrint +
                 ", freeContainerDate=" + freeContainerDate +
+                ", fTakeOrders=" + fTakeOrders +
+                ", fReason=" + fReason +
                 '}';
     }
 }