Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr into liweidong

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldDemandEnum.java

@@ -30,7 +30,7 @@ public enum MoldDemandEnum {
 	 * 状态枚举; 11001、新建，11002:已下发，11003、已完成
 	 */
 	MAF_STATUS_CREATE("新建", 11001),
-	MAF_STATUS_SEND("已下发", 11002),
+	MAF_STATUS_SEND("已申报", 11002),
 	MAF_STATUS_DONE("已关闭", 11003),
 
 	/**

blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/SalaryStandardMapper.xml

@@ -104,11 +104,40 @@
         PROCESS_NAME,
         NULL AS minStep,
         NULL AS maxStep,
-        TO_NUMBER(STEP_SETTLEMENT_PRICE) AS PRICE
+        NULL AS PRICE
         FROM
         STEP_DATA
         WHERE
-        STEP_TYPE IN ( 1, 2 ) UNION ALL
+        STEP_TYPE = 1
+        UNION ALL
+        SELECT
+        ID,
+        STANDARD_TYPE,
+        PROCESS_ID,
+        PART_NO,
+        SETTLEMENT_PRICE,
+        SETTLEMENT_UNIT,
+        STEP_TYPE,
+        STEP,
+        STEP_UNIT,
+        STEP_SETTLEMENT_PRICE,
+        STEP_SETTLEMENT_UNIT,
+        CREATE_USER,
+        CREATE_DEPT,
+        CREATE_TIME,
+        UPDATE_USER,
+        UPDATE_TIME,
+        STATUS,
+        IS_DELETED,
+        PROCESS_NAME,
+        TO_NUMBER( STEP ) AS minStep,
+        NULL AS maxStep,
+        TO_NUMBER( STEP_SETTLEMENT_PRICE ) AS PRICE
+        FROM
+        STEP_DATA
+        WHERE
+        STEP_TYPE = 2
+        UNION ALL
         SELECT
         sd.ID,
         sd.STANDARD_TYPE,

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java

@@ -533,12 +533,15 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 						if(moldDemand == null){
 							moldDemand = new MoldDemand();
 							moldDemand.setMoCode(null);
-							moldDemand.setPartCode(subPart.getPartCode());
+							moldDemand.setPartCode(yieldOrder.getPartCode());
-							moldDemand.setPartName(subPart.getPartName());
+							moldDemand.setPartName(yieldOrder.getPartName());
+							moldDemand.setToolCode(subPart.getPartCode());
+							moldDemand.setToolName(subPart.getPartName());
 							moldDemand.setDemandNum(subPart.getQuota() * yieldOrder.getYpQty());
 							moldDemand.setLinkOrderIds(yieldOrder.getId().toString());
-							moldDemand.setStatus(MoldDemandEnum.STATUS_WAITING.getCode());
+//							moldDemand.setStatus(MoldDemandEnum.STATUS_WAITING.getCode());
 							moldDemand.setMafStatus(MoldDemandEnum.MAF_STATUS_CREATE.getCode());
+							moldDemand.setMafType(MoldDemandEnum.MAF_TYPE_RB.getCode());
 							moldDemand.setNeedDate(yieldOrder.getDemandDate());
 							moldDemand.setQuaLevel(yieldOrder.getProductIdent());
 							moldDemandMapper.insert(moldDemand);
@@ -567,8 +570,9 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 					moldDemand.setToolCode(processMoldToolList.get(0).getMoldCode());
 					moldDemand.setToolName(processMoldToolList.get(0).getMoldName());
 					moldDemand.setLinkOrderIds(yieldOrder.getId().toString());
-					moldDemand.setStatus(MoldDemandEnum.STATUS_WAITING.getCode());
+//					moldDemand.setStatus(MoldDemandEnum.STATUS_WAITING.getCode());
 					moldDemand.setMafStatus(MoldDemandEnum.MAF_STATUS_CREATE.getCode());
+					moldDemand.setMafType(MoldDemandEnum.MAF_TYPE_RB.getCode());
 					moldDemand.setNeedDate(yieldOrder.getDemandDate());
 					moldDemand.setQuaLevel(yieldOrder.getProductIdent());
 					moldDemandMapper.insert(moldDemand);

blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java

@@ -99,7 +99,7 @@ public class DeptController extends BladeController {
 	/**
 	 * 列表
 	 */
-	@PreAuth(menu = "dept")
+//	@PreAuth(menu = "dept")
 	@GetMapping("/list")
 	@Parameters({
 		@Parameter(name = "deptName", description = "部门名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
@@ -134,7 +134,7 @@ public class DeptController extends BladeController {
 	/**
 	 * 懒加载列表
 	 */
-	@PreAuth(menu = "dept")
+//	@PreAuth(menu = "dept")
 	@GetMapping("/lazy-list")
 	@Parameters({
 		@Parameter(name = "deptName", description = "部门名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")),

blade-service/blade-system/src/main/java/org/springblade/system/controller/PostController.java

@@ -60,7 +60,7 @@ import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
 @NonDS
 @RestController
 @AllArgsConstructor
-@PreAuth(menu = "post")
+//@PreAuth(menu = "post")
 @RequestMapping("/post")
 @Tag(name = "岗位", description = "岗位")
 public class PostController extends BladeController {

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StExpireSubmissionMapper.xml

@@ -25,7 +25,12 @@
     <select id="selectStExpireSubmissionPage" resultType="org.springblade.wms.pojo.vo.StRealtimeStockVO">
         SELECT
             -- 主表：到期送检表所有字段
-            se.*,
+        se.es_code        AS esCode,
+        se.rls_id         AS rlsId,
+        se.es_dept        AS esDept,
+        se.es_time        AS esTime,
+        se.es_man         AS esMan,
+        se.submit_status  AS submitStatus,
             NVL(se.es_qty, 0),
             -- 物料表：物料编码、物料名称
             g.goods_code AS goodsCode,
@@ -33,6 +38,7 @@
             -- 库房表：所属仓库名称
             sh.sh_name AS shName,
             -- 实时库存表：炉批号、检验编号、质量等级
+            r.id,
             r.stove_pi_no AS stovePiNo,
             r.apply_for,
             r.scrap_cycle,

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsClassMapper.xml

@@ -21,6 +21,14 @@
 
     <select id="selectStGoodsClassPage" resultMap="stGoodsClassResultMap">
         select * from ST_GOODS_CLASS where is_deleted = 0
+        <if test="stGoodsClass.gcCode != null and stGoodsClass.gcCode != ''">
+            and gc_code like '%' || #{stGoodsClass.gcCode} || '%'
+        </if>
+
+        <!-- 分类名称 模糊查询 -->
+        <if test="stGoodsClass.gcName != null and stGoodsClass.gcName != ''">
+            and gc_name like '%' || #{stGoodsClass.gcName} || '%'
+        </if>
     </select>
 
 

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.xml

@@ -75,6 +75,15 @@
         <if test="param2.goodsStatus != null">
             AND se.goods_status = #{param2.goodsStatus}
         </if>
+
+        <if test="param2.delivery != null">
+            AND se.delivery = #{param2.delivery}
+        </if>
+
+        <if test="param2.special != null">
+            AND se.special = #{param2.special}
+        </if>
+
         ORDER BY se.create_time DESC
     </select>
 

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java

@@ -26,6 +26,7 @@ import org.springblade.wms.pojo.entity.StGoods;
 import org.springblade.wms.pojo.vo.StBuyOrderVO;
 import org.springblade.wms.service.IStBuyOrderService;
 import org.springblade.wms.service.IStGoodsService;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -46,6 +47,7 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
 	@Resource
 	private IStGoodsService stGoodsService;
 	@Resource
+	@Lazy
 	private StHttpRequestService stHttpRequestService;
 	@Resource
 	private IMesApprovalRecordClient mesApprovalRecordClient;

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGlassCakeOutServiceImpl.java

@@ -85,9 +85,25 @@ public class StGlassCakeOutServiceImpl extends BaseServiceImpl<StGlassCakeOutMap
 		Date now = new Date();
 
 		WorkOrder workOrder = stOtherReceiptRecordMapper.getByWoCode(dto.getWoCode());
+		if (workOrder == null) {
+			throw new RuntimeException("根据工单编号【" + dto.getWoCode() + "】未查询到工单信息");
+		}
+
+		Long yoId = workOrder.getYoId();
+		if (yoId == null) {
+			throw new RuntimeException("工单【" + dto.getWoCode() + "】未查到生产订单ID");
+		}
+
 		YieldOrder yieldOrder = stOtherReceiptRecordMapper.getByYoId(workOrder.getYoId());
+		if (yieldOrder == null) {
+			throw new RuntimeException("根据生产订单ID【" + yoId + "】未查询到生产订单信息");
+		}
 
 		DsPartEntity partOne = partClient.getPart(workOrder.getPartCode(),yieldOrder.getPartVersion());
+		if (partOne == null) {
+			throw new RuntimeException("根据零件编号【" + workOrder.getPartCode() + "】未查询到零件信息");
+		}
+
 		List<DsPartRelationEntity> partRelationEntityList = partClient.getSubPart(partOne.getId());
 
 		List<DsPartEntity> glassCakePartList = new ArrayList<>();

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StHttpRequestService.java

@@ -8,8 +8,10 @@ import okhttp3.*;
 import org.springblade.wms.pojo.dto.ErpStPurOtherDTO;
 import org.springblade.wms.pojo.dto.StPdmPartDTO;
 import org.springblade.wms.pojo.dto.StPdmPartResponseDTO;
+import org.springblade.wms.service.IStBuyOrderService;
 import org.springblade.wms.service.ISyDockingLogService;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
@@ -41,8 +43,9 @@ public class StHttpRequestService {
 
 	@Resource
 	private ISyDockingLogService syDockingLogService;
-	//	@Resource
+	@Resource
-//	private IStBuyOrderService stBuyOrderService;
+	@Lazy
+	private IStBuyOrderService stBuyOrderService;
 //	private final ISyDockingLogService syDockingLogService;
 //
 //	private final IStBuyOrderService stBuyOrderService;
@@ -215,7 +218,7 @@ public class StHttpRequestService {
 					// 4. 处理响应结果（和原逻辑一致）
 					if (result != null && "200".equals(result.getString("retCode"))) {
 						// 成功：更新额外单号
-//						stBuyOrderService.httpUpdateBo(erpStPurOtherDto.getBoId(), result.getString("responseBody"));
+						stBuyOrderService.httpUpdateBo(erpStPurOtherDto.getBoId(), result.getString("responseBody"));
 					} else {
 						// 失败：记录日志并跳过
 						String errorDesc = result != null ? result.getString("errorDesc") : "未知错误";

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StLendServiceImpl.java

@@ -85,7 +85,7 @@ public class StLendServiceImpl extends BaseServiceImpl<StLendMapper, StLend> imp
 			}
 			// 统一赋值公共属性
 			stLend.setDeptId(user.getDeptId());
-			stLend.setLeMan(user.getUserId()); // 经手人也赋值为当前登录用户
+			stLend.setLeMan(stLend.getLeMan());
 			stLend.setMemo(stLend.getMemo());
 		}
 
@@ -104,7 +104,6 @@ public class StLendServiceImpl extends BaseServiceImpl<StLendMapper, StLend> imp
 		return batchFlag;
 	}
 
-	// ========== 完全复用你的【物料借出核心方法】lendInterface 只改 PfUserInfo → BladeUser，逻辑一行不变 ==========
 	private void lendInterface(Long leId, BladeUser user) throws Exception {
 		List<StStoreBill> storeBillList = new ArrayList<>();
 		StLend stLend = this.getById(leId);

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java

@@ -292,9 +292,24 @@ public class StOtherReceiptRecordServiceImpl extends BaseServiceImpl<StOtherRece
 		List<StOtherReceiptRecord> list = baseMapper.selectByWoCode(woCode);
 
 		WorkOrder workOrder = baseMapper.getByWoCode(woCode);
-		YieldOrder yieldOrder = baseMapper.getByYoId(workOrder.getYoId());
+		if (workOrder == null) {
+			throw new RuntimeException("根据工单编号【" + woCode + "】未查询到工单信息");
+		}
+
+		Long yoId = workOrder.getYoId();
+		if (yoId == null) {
+			throw new RuntimeException("工单【" + woCode + "】未查到生产订单ID");
+		}
+
+		YieldOrder yieldOrder = baseMapper.getByYoId(yoId);
+		if (yieldOrder == null) {
+			throw new RuntimeException("根据生产订单ID【" + yoId + "】未查询到生产订单信息");
+		}
 
 		DsPartEntity partOne = partClient.getPart(workOrder.getPartCode(),yieldOrder.getPartVersion());
+		if (partOne == null) {
+			throw new RuntimeException("根据零件编号【" + workOrder.getPartCode() + "】未查询到零件信息");
+		}
 		List<DsPartRelationEntity> partRelationEntityList = partClient.getSubPart(partOne.getId());
 
 		List<DsPartEntity> glassCakePartList = new ArrayList<>();