Merge branch 'dev' into pre-production

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

@@ -45,6 +45,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -160,6 +161,23 @@ public class BasicMaterialController extends BladeController {
 		ExcelUtil.export(response, "物料基础信息数据" + DateUtil.time(), "物料基础信息数据表", list, BasicMaterialExcel.class);
 	}
 
+	/**
+	 * 导出数据模板
+	 */
+	@GetMapping("/export-basicMaterialMb")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据模板", notes = "传入basicMaterial")
+	public void exportBasicMaterialMb(@ApiIgnore @RequestParam Map<String, Object> basicMaterial, BladeUser bladeUser, HttpServletResponse response) {
+//		QueryWrapper<BasicMaterialEntity> queryWrapper = Condition.getQueryWrapper(basicMaterial, BasicMaterialEntity.class);
+//		//if (!AuthUtil.isAdministrator()) {
+//		//	queryWrapper.lambda().eq(BasicMaterial::getTenantId, bladeUser.getTenantId());
+//		//}
+//		queryWrapper.lambda().eq(BasicMaterialEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+//		List<BasicMaterialExcel> list = basicMaterialService.exportBasicMaterial(queryWrapper);
+		List<BasicMaterialExcel> list = new ArrayList<>();
+		ExcelUtil.export(response, "物料基础信息数据模板" + DateUtil.time(), "物料基础信息数据模板表", list, BasicMaterialExcel.class);
+	}
+
 	/**
 	 * 导入物料基础信息
 	 */

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -376,7 +376,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 			if (Objects.isNull(distributionStockArticleEntity)) {
 				Date date = new Date();
 				if(StringUtil.isNoneBlank(operationTime)){
-					 date = CommonUtil.StringToDateByT(operationTime);
+					 date = CommonUtil.StringToDate(operationTime);
 				}
 				logger.info("#################handleDataToPlatform.waybillNoNum: {}", waybillNoNum);
 
@@ -606,7 +606,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 		//进销售
 		entity.setDealerCode(distributionStockArticleEntity.getDealerCode());
 		entity.setDealerName(distributionStockArticleEntity.getDealerName());
-
+		entity.setWarehouseEntryTimeEnd(distributionStockArticleEntity.getWarehouseEntryTime());
 
 		// 绑定部门--仓库
 		if (!Objects.isNull(basicdataWarehouseEntity)) {