Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicNoticeController.java

@@ -32,6 +32,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.annotation.PreAuth;
 import org.springblade.core.secure.constant.AuthConstant;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tenant.annotation.TenantDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -79,6 +80,11 @@ public class BasicNoticeController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入notice")
 	public R<IPage<BasicNoticeVO>> list(@ApiIgnore @RequestParam Map<String, Object> notice, Query query) {
 		BasicNoticeWrapper.build().noticeQuery(notice);
+
+		if(AuthUtil.isAdmin()){
+			return R.data(null);
+		}
+
 		IPage<BasicNotice> pages = noticeService.page(Condition.getPage(query), Condition.getQueryWrapper(notice, BasicNotice.class));
 		return R.data(BasicNoticeWrapper.build().pageVO(pages));
 	}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFactoryCategoryImporter.java

@@ -192,28 +192,46 @@ public class BasicdataFactoryCategoryImporter implements ExcelImporter<Basicdata
 							String mainName = basicdataFactoryCategoryExcel.getMainName();
 							String mainCategory1 = basicdataFactoryCategoryExcel.getMainCategory();
 							List<BasicdataMainCategoryEntity> mainCategoryEntityList = groupedByFactoryCategoryId.get(factoryCategoryEntityId);
-							//把mainCategoryEntityList转成以mainName为Key的Map
-							Map<String, BasicdataMainCategoryEntity> mainCategoryEntityMap = mainCategoryEntityList.stream()
-								.collect(Collectors.toMap(BasicdataMainCategoryEntity::getMainName, entity -> entity));
-
-							BasicdataMainCategoryEntity mainCategory = mainCategoryEntityMap.get(mainName);
-							if (Objects.isNull(mainCategory)){
-								mainCategory = new BasicdataMainCategoryEntity();
+							if(CollUtil.isNotEmpty(mainCategoryEntityList)){
+								//把mainCategoryEntityList转成以mainName为Key的Map
+								Map<String, BasicdataMainCategoryEntity> mainCategoryEntityMap = mainCategoryEntityList.stream()
+									.collect(Collectors.toMap(BasicdataMainCategoryEntity::getMainName, entity -> entity));
+
+								BasicdataMainCategoryEntity mainCategory = mainCategoryEntityMap.get(mainName);
+								if (Objects.isNull(mainCategory)){
+									mainCategory = new BasicdataMainCategoryEntity();
+									mainCategory.setFactoryCategoryId(factoryCategoryEntityId);
+								}
+
+								mainCategory.setMainName(mainName);
+								BasicdataMainEntity basicdataMainEntity = mainMap.get(mainName);
+								if(!Objects.isNull(basicdataMainEntity)){
+									mainCategory.setMainId(basicdataMainEntity.getId());
+								}
+								BasicdataCategoryEntity basicdataCategoryEntity = categoryMap.get(mainCategory1);
+								if(!Objects.isNull(basicdataCategoryEntity)){
+									mainCategory.setCategoryId(basicdataCategoryEntity.getId());
+								}
+								mainCategory.setCategory(mainCategory1);
+
+								newMainCategoryEntities.add(mainCategory);
+							}else{
+								BasicdataMainCategoryEntity mainCategory = new BasicdataMainCategoryEntity();
 								mainCategory.setFactoryCategoryId(factoryCategoryEntityId);
+								mainCategory.setMainName(mainName);
+								BasicdataMainEntity basicdataMainEntity = mainMap.get(mainName);
+								if(!Objects.isNull(basicdataMainEntity)){
+									mainCategory.setMainId(basicdataMainEntity.getId());
+								}
+								BasicdataCategoryEntity basicdataCategoryEntity = categoryMap.get(mainCategory1);
+								if(!Objects.isNull(basicdataCategoryEntity)){
+									mainCategory.setCategoryId(basicdataCategoryEntity.getId());
+								}
+								mainCategory.setCategory(mainCategory1);
+
+								newMainCategoryEntities.add(mainCategory);
 							}
 
-							mainCategory.setMainName(mainName);
-							BasicdataMainEntity basicdataMainEntity = mainMap.get(mainName);
-							if(!Objects.isNull(basicdataMainEntity)){
-								mainCategory.setMainId(basicdataMainEntity.getId());
-							}
-							BasicdataCategoryEntity basicdataCategoryEntity = categoryMap.get(mainCategory1);
-							if(!Objects.isNull(basicdataCategoryEntity)){
-								mainCategory.setCategoryId(basicdataCategoryEntity.getId());
-							}
-							mainCategory.setCategory(mainCategory1);
-
-							newMainCategoryEntities.add(mainCategory);
 
 						});
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml

@@ -340,7 +340,8 @@
             and ltco.node_id = #{param.warehouseId}
         </if>
         group by ltco.order_code,
-        ltco.waybill_no) l on l.orderCode = t.order_code and l.waybillNo = t.waybill_number
+        ltco.waybill_no
+        HAVING IFNULL( sum( start_num ), 0 ) > 0) l on l.orderCode = t.order_code and l.waybillNo = t.waybill_number
         left join logpm_warehouse_waybill lww on lww.waybill_no = t.waybill_number
         where IFNULL( t.stock_num, 0 )-IFNULL( l.planNum,0) > 0
         and lww.abolish_status = 0