模板上传调整、货区类型调整

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicPrintTemplateEntity.java

@@ -61,6 +61,11 @@ public class BasicPrintTemplateEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "模板版本")
 	private String version;
+	/**
+	 * 模板版本
+	 */
+	@ApiModelProperty(value = "模板路径")
+	private String templateUrl;
 	/**
 	 * 预留1
 	 */

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsAreaEntity.java

@@ -79,7 +79,7 @@ public class BasicdataGoodsAreaEntity extends TenantEntity {
 	/**
 	 * 是否备货区
 	 */
-	@ApiModelProperty(value = "是否备货区")
-	private Integer isStrageArea;
+	@ApiModelProperty(value = "货区类型")
+	private Integer areaType;
 
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java

@@ -16,7 +16,7 @@ import org.springblade.core.launch.BladeApplication;
 public class BasicApplication {
 
 	public static void main(String[] args) {
-		BladeApplication.run(LauncherConstant.APPLICATION_BASIC_NAME.concat("-lmy"), BasicApplication.class, args);
+		BladeApplication.run(LauncherConstant.APPLICATION_BASIC_NAME.concat("-tjj"), BasicApplication.class, args);
 	}
 
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPrintTemplateServiceImpl.java

@@ -24,6 +24,9 @@ import com.logpm.basic.mapper.BasicPrintTemplateMapper;
 import com.logpm.basic.service.IBasicPrintTemplateService;
 import com.logpm.basic.vo.BasicPrintTemplateVO;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.Func;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
@@ -54,5 +57,14 @@ public class BasicPrintTemplateServiceImpl extends BaseServiceImpl<BasicPrintTem
 		return basicPrintTemplateList;
 	}
 
-
+	@Override
+	public boolean save(BasicPrintTemplateEntity entity) {
+		if (Func.isEmpty(entity)){
+			return false;
+		}
+		BladeUser user = AuthUtil.getUser();
+		//添加创建人编号
+		entity.setFounder(user.getUserId().toString());
+		return super.save(entity);
+	}
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicTenantCodeServiceImpl.java

@@ -26,6 +26,7 @@ import com.logpm.basic.vo.BasicTenantCodeVO;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.system.feign.IDictBizClient;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -82,7 +83,7 @@ public class BasicTenantCodeServiceImpl extends BaseServiceImpl<BasicTenantCodeM
 	public boolean save(BasicTenantCodeEntity entity) {
 		String code = entity.getCode();
 		Integer codeType = entity.getCodeType();
-		if (StringUtils.isEmpty(code)){
+		if (Func.isBlank(code)){
 			code = "DA--00"+codeType;
 			entity.setCode(code);
 		}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataBrandController.java

@@ -102,7 +102,6 @@ public class BasicdataBrandController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入basicdataBrand")
 	public R<List<BasicdataBrandEntity>> lists(@ApiIgnore @RequestParam Map<String, Object> basicdataBrand, Query query) {
 		BasicdataBrandEntity basicdataBrandEntity = JSONObject.parseObject(JSONObject.toJSONString(basicdataBrand), BasicdataBrandEntity.class);
-
 		List<BasicdataBrandEntity> list = basicdataBrandService.list(Wrappers.<BasicdataBrandEntity>query().lambda().
 			eq(StringUtils.isNotBlank(basicdataBrandEntity.getBrandName()), BasicdataBrandEntity::getBrandName, basicdataBrandEntity.getBrandName())
 		);

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml

@@ -60,7 +60,7 @@
         goods_area.warehouse_id,
         goods_area.headline,
         goods_area.enable_status,
-        goods_area.is_strage_area,
+        goods_area.area_type,
         warehouse.NAME AS warehouseName,
         blade_user.name AS createUserName,
         blade_dept.dept_name AS createDeptName
@@ -78,7 +78,7 @@
                and goods_area.enable_status = #{po.enableStatus}
            </if>
            <if test="po.isStrageAreaData != null and po.isStrageAreaData!=''">
-               and goods_area.is_strage_area = #{po.isStrageAreaData}
+               and goods_area.area_type = #{po.areaType}
            </if>
        </where>
     </select>

doc/dpm/物流租户系统.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.5.1",
   "createdTime": "2023-3-27 13:32:56",
-  "updatedTime": "2023-5-26 17:18:03",
+  "updatedTime": "2023-5-29 14:01:34",
   "dbConns": [],
   "profile": {
     "default": {
@@ -10697,6 +10697,23 @@
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
           "id": "E71993CB-70A4-4ACC-A76E-984EAF2E38C7"
         },
+        {
+          "defKey": "template_url",
+          "defName": "模板路径",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 500,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "10E08F76-1D1F-4EE5-A9A0-5A50648B5743"
+        },
         {
           "defKey": "reserve1",
           "defName": "预留1",
@@ -12138,8 +12155,8 @@
           "id": "1EAAA3A6-32C5-4465-9467-F6994C6A73BB"
         },
         {
-          "defKey": "is_strage_area",
-          "defName": "是否备货区",
+          "defKey": "area_type",
+          "defName": "货区类型",
           "comment": "",
           "type": "",
           "len": "",
@@ -12149,11 +12166,10 @@
           "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": false,
-          "refDict": null,
+          "refDict": "",
           "extProps": {},
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
-          "id": "E724F646-DB36-4696-9A14-848980762BE6",
-          "uiHint": null
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "948119D6-7C42-4223-B7D6-24173111754C"
         }
       ],
       "correlations": [],
@@ -32685,4 +32701,4 @@
     }
   ],
   "dbConn": []
-}
+}