Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms

lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/RawAssistIStorController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvService;
 import org.nl.modules.logging.annotation.Log;
 import org.nl.wms.st.inbill.service.RawAssistIStorService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,9 +22,18 @@ import java.util.Map;
 @Slf4j
 public class RawAssistIStorController {
 
+    /**
+     * 一期入库服务
+     */
     @Autowired
     private RawAssistIStorService rawAssistIStorService;
 
+    /**
+     * 二期入库服务
+     */
+    @Autowired
+    private IStIvtIostorinvService iStIvtIostorinvService;
+
     @GetMapping
     @Log("查询入库单据")