From 2fa5571c76fa3a9f115a7e7598b297879a437228 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期二, 13 八月 2024 18:33:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phpsasrs' into phpsasrs

---
 src/main/java/com/zy/asrs/service/MobileService.java |   44 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 43 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 072f9a3..874d852 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -1,8 +1,16 @@
 package com.zy.asrs.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.core.common.R;
+import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.param.CheckBom;
 import com.zy.asrs.entity.param.CombParam;
 import com.zy.asrs.entity.param.MobileAdjustParam;
+import com.zy.asrs.entity.param.OffSaleParam;
+
+import java.util.Date;
 
 public interface MobileService {
 
@@ -12,11 +20,45 @@
     void comb(CombParam param, Long userId);
 
     /**
+     * 缁勬墭
+     */
+    void comb2(CombParam param, Long userId);
+
+    /**
+     * 缁勬墭
+     */
+    void mergeComb(CombParam param, Long userId);
+
+    /**
+     * 鏍¢獙bom
+     */
+    R checkBom(CheckBom param, Long userId);
+
+    /**
+     * 涓婃灦
+     */
+    void onSale(CombParam param);
+
+    /**
+     * 涓嬫灦
+     */
+    void offSale(OffSaleParam param);
+
+    /**
      * 鐩樼偣
      */
     void adjust(MobileAdjustParam param, Long userId);
 
-    void packComb(CombParam param, Long userId);
+//    void packComb(CombParam param, Long userId);
 
     void pakoutByOrder(JSONObject param, Long userId);
+
+    void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
+                  Double curOutQty, Integer ioType, Long userId, Date now);
+
+    R manDetlIn(JSONObject json);
+
+    R manDetlOut(JSONObject json);
+
+    void adjustNew(MobileAdjustParam param, Boolean re, Long userId);
 }

--
Gitblit v1.9.1