修改部分bug

src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java

@@ -1480,7 +1480,6 @@ public class MaterialController {
     @PostMapping("/findMaterialForTaking")
     public RestResponse findMaterialForTaking(@RequestBody Map<String, Object> map, HttpServletRequest request) {
         String placeId = (String) map.get("placeId");
-
         // 用于查询物料
         Map<String, Object> param = new HashMap<>();
         param.put("mname", map.get("mname"));
@@ -1488,7 +1487,26 @@ public class MaterialController {
         List<InventoryP> inventory = materialService.findInventory(param);
         if ("0".equals(placeId)) {
             // 如果是默认库位
+            if (inventory.size() > 1) {
                 return new RestResponse(inventory, materialService.findInventoryCount(param), 200);
+            } else {
+                // 获取当前物料
+                InventoryP materialP = inventory.get(0);
+                MaterialAndPlace pm = placeService.findPlaceAndMaterialByMidAndPid(0, materialP.getId());
+                if(pm!=null) {
+                    Map<String, Object> paramForCode = new HashMap<>();
+                    paramForCode.put("mcode", materialP.getCode());
+                    paramForCode.put("codeFlag", 1);
+                    List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramForCode);
+                    List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(materialP.getMid());
+                    materialP.setSplitInfoList(splitInfoByMid);
+                    materialP.setMaterialAndBarCodeList(materialByBarCodeByCondition);
+                    materialP.setBaseUnitQuantity(pm.getQuantity());
+                    return new RestResponse(materialP, 1, 200);
+                }else {
+                    return new RestResponse("", 0, 200);
+                }
+            }
         } else {
             // 如果不是默认库位
             // 获取当前库位

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@@ -1267,15 +1267,15 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                     // 如果当前库存数量满足要求
 
                     // 获取当前出库的具体数目
-                    int residue = trueOut / splitInfo.getQuantity();
+                    int residue = (int) Math.ceil(trueOut / (double)splitInfo.getQuantity());
                     // 获取剩余数目
                     int residue_realQuantity = trueOut - residue * splitInfo.getQuantity();
 
                     // 设置新总额
-                    inventory.setAmounts(inventory.getAmounts() - (residue + 1) * inventory.getPrice());
+                    inventory.setAmounts(inventory.getAmounts() - residue  * inventory.getPrice());
 
                     // 设置新库存
-                    inventory.setQuantity(inventory.getQuantity() - residue - 1);
+                    inventory.setQuantity(inventory.getQuantity() - residue );
 
                     //更新库存
                     materialMapper.updateInventory(inventory);

src/main/resources/templates/pages/split/split-out.html

@@ -25,6 +25,13 @@
                             </div>
                         </div>
 
+                        <div class="layui-inline">
+                            <label class="layui-form-label">物料型号：</label>
+                            <div class="layui-input-block">
+                                <input type="text" class="layui-input" id="version" name="version" autocomplete="off" placeholder="请输入物料型号"/>
+                            </div>
+                        </div>
+
                         <div class="layui-inline">
                             <label class="layui-form-label">物料编码：</label>
                             <div class="layui-input-block">
@@ -155,6 +162,9 @@
             if (data.mcode !== '') {
                 req.mcode = data.mcode
             }
+            if (data.version !== '') {
+                req.version = data.version
+            }
 
             //执行搜索重载
             table.reload('currentTableId', {

src/main/resources/templates/pages/stockTaking/stockTaking.html

@@ -167,14 +167,14 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">材质:</label>
                                                 <div class="layui-input-block">
-                                                    <input type="text" placeholder="请填写材质名称" class="layui-input"
+                                                    <input type="text" placeholder="请填写材质名称" class="layui-input" readonly
                                                            name="texture"/>
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">规格型号:</label>
                                                 <div class="layui-input-block">
-                                                    <input type="text" placeholder="请填写规格型号" class="layui-input"
+                                                    <input type="text" placeholder="请填写规格型号" class="layui-input" readonly
                                                            name="version"/>
                                                 </div>
                                             </div>
@@ -1042,7 +1042,7 @@
                                 materialTypeItem[3].value = material.typeId;
                                 textureChildren.childNodes[3].childNodes[1].value = material.texture === null || material.texture === undefined ? '' : material.texture;
                                 versionChildren.childNodes[3].childNodes[1].value = material.version === null || material.version === undefined ? '' : material.version;
-                                inventoryChildren.childNodes[3].childNodes[1].value = material.quantity;
+                                inventoryChildren.childNodes[3].childNodes[1].value = material.baseUnitQuantity;
                                 var idNumber = materialId.name.split("mid")[1];
                                 // 获取物料与条形码的对应关系
                                 var materialAndBarCodeList = material["materialAndBarCodeList"];
@@ -1058,7 +1058,7 @@
                                 }
                                 let unitItem = $("#unit" + idNumber);
                                 unitItem.empty();
-                                unitItem.append(new Option(material.unit, "-1"));
+                                unitItem.append(new Option(material.baseUnit, "-1"));
                                 let splitInfoList = material.splitInfoList;
                                 if (splitInfoList.length > 0) {
                                     $.each(splitInfoList, function (index, item) {