1

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateStocktakeReq.java

@@ -34,7 +34,7 @@ public class UpdateStocktakeReq extends BaseRequest {
     /**
      * 组织机构id
      */
-    @NotNull(message = "仓库id不能为空",groups = {add.class,edit.class})
+    @NotNull(message = "组织机构id不能为空",groups = {add.class,edit.class})
     private Long orgId;
 
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/EquipmentSizeService.java

@@ -29,6 +29,6 @@ public interface EquipmentSizeService extends IService<EquipmentSize> {
     //根据typeId返回号型名称
     List<String> getByTypeIds(QueryEquipmentSizeReq req);
 
-    //根据
+    //根据typeId拿到装备typeIds
     List<String> selectByTypeIds(List<String> typeIdsList);
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

@@ -186,10 +186,22 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         //通过遍历批量保存详细信息
         String s="";
         if (req.getOrderType().equals("in")){
-            s=s+req.getBussinessType()+"入库单：";
+            Long dictId = sysDictService.getOne(new LambdaQueryWrapper<SysDict>()
+                    .eq(SysDict::getDictCode, "bussiness_type")).getDictId();
+            String itemText = sysDictItemService.getOne(new LambdaQueryWrapper<SysDictItem>()
+                    .eq(SysDictItem::getDictId, dictId)
+                    .eq(SysDictItem::getItemValue, req.getBussinessType())).getItemText();
+            s=s+itemText+"单：";
         }else {
+            Long dictId = sysDictService.getOne(new LambdaQueryWrapper<SysDict>()
+                    .eq(SysDict::getDictCode, "out_type")).getDictId();
+            String itemText = sysDictItemService.getOne(new LambdaQueryWrapper<SysDictItem>()
+                    .eq(SysDictItem::getDictId, dictId)
+                    .eq(SysDictItem::getItemValue, req.getBussinessType())).getItemText();
+            s=s+itemText+"单：";
             s=s+req.getBussinessType()+"出库单：";
         }
+
         for (UpdateOrderDetailReq listReq:req.getDetailList()) {
             OrderDetail detail=new OrderDetail();
             BeanPlusUtil.copyProperties(listReq, detail);
@@ -210,7 +222,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                 }
             }
             //添加日志记录
-            s=s+listReq.getWarehouseName()+"预计数量："+listReq.getTypeName()+"【"+listReq.getSizeName()+"】"+listReq.getPlanNum()+"/";
+            s=s+listReq.getWarehouseName()+"【"+listReq.getTypeName()+"--"+listReq.getSizeName()+"】：预计数量："+listReq.getPlanNum()+"/";
             detailList.add(detail);
         }
         orderDetailService.saveBatch(detailList);
@@ -359,7 +371,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             orderLog.setCreateTime(DateTimeUtil.getCurrentDateTime());
             a=orderLogService.save(orderLog);
         }else{//直接替换
-            createOrder.setHistoryMsg(JSON.toJSONString(req.getDetailList()));
+            createOrder.setHistoryMsg(s);
             createOrder.setUpdateTime(DateTimeUtil.getCurrentDateTime());
             a=orderLogService.updateById(createOrder);
         }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/TjServiceImpl.java

@@ -111,8 +111,8 @@ public class TjServiceImpl implements TjService {
         List<String> typeIdsList = equipmentSizeService.selectByTypeIds(req.getTypeIdsList());
         List<String> sizeNameList = req.getSizeNameList();
         //将前端传递的值进行处理并且执行存储过程
-        String sql="and (org_id="+req.getOrgId()+"or org_parent_id = "+req.getOrgId()+")";
-        if (typeIdsList.size()>0){
+        String sql="and (org_id="+req.getOrgId()+" or org_parent_id = "+req.getOrgId()+")";
+        if (typeIdsList.size()>0 && !typeIdsList.isEmpty()){
             sql+="and type_id in (";
             for (String typeId:typeIdsList) {
                 sql+=typeId+",";
@@ -120,7 +120,7 @@ public class TjServiceImpl implements TjService {
             sql = sql.substring(0, sql.length() - 1);
             sql+=")";
         }
-        if (sizeNameList.size()>0){
+        if (sizeNameList.size()>0 && !sizeNameList.isEmpty()){
             sql+="and size_name in (";
             for (String sizeName:sizeNameList) {
                 sql+=sizeName+",";