From 2ee70a38e4c832e3888b12d29ebf962456069cdb Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 03 七月 2024 14:30:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phpsasrs' into phpsasrs
---
src/main/java/com/zy/asrs/service/MobileService.java | 20 +++++++++++++++++++-
1 files changed, 19 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 6172647..06ab3c4 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -1,9 +1,11 @@
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;
@@ -16,6 +18,16 @@
* 缁勬墭
*/
void comb(CombParam param, Long userId);
+
+ /**
+ * 缁勬墭
+ */
+ void comb2(CombParam param, Long userId);
+
+ /**
+ * 鏍￠獙bom
+ */
+ R checkBom(CheckBom param, Long userId);
/**
* 涓婃灦
@@ -32,10 +44,16 @@
*/
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