Browse Source

佰穗莱1.1

dfsfs 1 year ago
parent
commit
e1c314419a

+ 12 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaBasLocationInfoController.java

@@ -5,6 +5,7 @@ import com.ruoyi.base.service.IBaseLocationInfoService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -22,7 +23,6 @@ public class PdaBasLocationInfoController {
     @Autowired
     private IBaseLocationInfoService baseLocationInfoService;
 
-
     /**
      * 获取库位列表
      */
@@ -32,4 +32,15 @@ public class PdaBasLocationInfoController {
         return AjaxResult.success("", list);
     }
 
+    /**
+     * 标记接驳位是否有空托
+     * @param baseLocationInfo
+     * @return
+     */
+    @PostMapping("/markEmptyTray")
+    public AjaxResult markEmptyTray(BaseLocationInfo baseLocationInfo) {
+        baseLocationInfoService.updateBaseLocationInfo(baseLocationInfo);
+        return AjaxResult.success();
+    }
+
 }

+ 5 - 0
warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/dto/QcOutboundDTO.java

@@ -20,6 +20,11 @@ public class QcOutboundDTO implements Serializable {
      */
     private String locationTo;
 
+    /**
+     * 是否叫车 Y:叫车 N:不叫车
+     */
+    private String ifCallCar;
+
     private String user;
 
 }

+ 6 - 0
warewms-base/src/main/java/com/ruoyi/base/domain/BaseLocationInfo.java

@@ -128,8 +128,14 @@ public class BaseLocationInfo extends BaseEntity {
 
     private Double weightLimit;
 
+    /**
+     * 是否有空托标记
+     */
     private String userdefine1;
 
+    /**
+     * 是否放行标记
+     */
     private String userdefine2;
 
     private String userdefine3;