suojin
/
jonhon-mes-svr
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

结算大类

Browse Source
liweidong
maxiangong 1 day ago
parent 213594f6b1
commit ae1ea0d8aa
6 changed files with 141 additions and 61 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/entity/OemStatementCategoryEntity.java
  2. 2
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/entity/OemStatementEntity.java
  3. 12
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/request/StatementQuery.java
  4. 6
      blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemStatementCategoryController.java
  5. 32
      blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml
  6. 53
      blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java

1
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/entity/OemStatementCategoryEntity.java
Unescape View File

@ -5,7 +5,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import java.io.Serial;
@Data

2
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/entity/OemStatementEntity.java
Unescape View File

@ -221,4 +221,6 @@ public class OemStatementEntity extends BaseEntity {
@Schema(description = "结算大类")
private String statementCategory;
@Schema(description = "流程卡号")
private String cardNo;
}

12
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/request/StatementQuery.java
Unescape View File

@ -92,6 +92,18 @@ public class StatementQuery {
@Schema(description = "异常原因/备注")
private String memo;
@Schema(description = "计划单号")
private String ypCode;
@Schema(description = "镀种")
private String plate;
@Schema(description = "工艺能力")
private Long caId;
@Schema(description = "流程卡号")
private String cardNo;
/**
* 排序字段
*/

6
blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemStatementCategoryController.java
Unescape View File

@ -119,11 +119,11 @@ public class OemStatementCategoryController {
int rowNum = i + 2;
OemStatementCategoryExcel row = importList.get(i);
if (StringUtils.isEmpty(row.getStatementCategory())) {
return R.fail(String.format("[%]行结算大类未填写", rowNum));
return R.fail(rowNum + "行结算大类未填写");
}
String uniqueStr = row.getStatementCategory();
if (!excelUniqueSet.add(uniqueStr)) {
return R.fail(String.format("[%]行在Excel中重复", rowNum));
return R.fail(rowNum + "行在Excel中重复");
}
OemStatementCategoryEntity entity = new OemStatementCategoryEntity();
BeanUtils.copyProperties(row, entity);
@ -141,7 +141,7 @@ public class OemStatementCategoryController {
int rowNum = i + 2;
String name = importList.get(i).getStatementCategory();
if (dbExistSet.contains(name)) {
R.fail(String.format("[%]行错误，[%]已存在不可重复导入", rowNum, name));
return R.fail(rowNum + "行错误，"+ name + "已存在不可重复导入");
}
}
}

32
blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml
Unescape View File

@ -101,7 +101,7 @@
<result column="PUT_STORE_DATE" property="putStoreDate"/>
<result column="STATEMENT_CATEGORY_ID" property="statementCategoryId"/>
<result column="STATEMENT_CATEGORY" property="statementCategory"/>
<result column="CARD_NO" property="cardNo"/>
</resultMap>
<select id="exportOemStatement" resultType="org.springblade.desk.oem.pojo.excel.OemStatementExcel">
@ -150,7 +150,8 @@
p.ID as part_id,
i.CA_NAME,
g.STATEMENT_CATEGORY_ID,
j.STATEMENT_CATEGORY
j.STATEMENT_CATEGORY,
d.CARD_NO
FROM
MES_WORK_PLAN a
INNER JOIN BS_PROCESS_SET b ON a.PPS_ID = b.ID AND b.IS_DELETED = 0
@ -194,8 +195,7 @@
</select>
<select id="selectOemStatementPage" resultMap="StatementVOResultMap">
SELECT
ID,
SELECT ID,
YP_CODE,
WO_CODE,
PART_ID,
@ -206,6 +206,7 @@
PPS_ID,
PS_CODE,
PS_NAME,
CA_ID,
CA_NAME,
OC_ID,
OC_CODE,
@ -234,7 +235,8 @@
to_char(PUSH_TIME, 'yyyy-MM-dd') as PUSH_DATE,
STATEMENT_NO,
STATEMENT_CATEGORY_ID,
STATEMENT_CATEGORY
STATEMENT_CATEGORY,
CARD_NO
FROM MES_OEM_STATEMENT
<where>
IS_DELETED = 0
@ -252,20 +254,38 @@
AND PUT_STORE_TIME &lt; #{query.postPlatingStorageTimeEnd} + 1
</if>
<if test="query.productIdent != null and query.productIdent != ''">
AND PRODUCT_IDENT = #{query.productIdent}
AND PRODUCT_IDENT LIKE CONCAT('%', CONCAT(#{query.productIdent}, '%'))
</if>
<if test="query.manual != null and query.manual != ''">
AND manual = #{query.manual}
</if>
<if test="query.caId != null and query.caId != ''">
AND CA_ID = #{query.caId}
</if>
<if test="query.ppsId != null and query.ppsId != ''">
AND PPS_ID = #{query.ppsId}
</if>
<if test="query.woCode != null and query.woCode != ''">
AND WO_CODE LIKE CONCAT('%', CONCAT(#{query.woCode}, '%'))
</if>
<if test="query.partCode != null and query.partCode != ''">
AND PART_CODE LIKE CONCAT('%', CONCAT(#{query.partCode}, '%'))
</if>
<if test="query.ypCode != null and query.ypCode != ''">
AND YP_CODE LIKE CONCAT('%', CONCAT(#{query.ypCode}, '%'))
</if>
<if test="query.batchNo != null and query.batchNo != ''">
AND BATCH_NO LIKE CONCAT('%', CONCAT(#{query.batchNo}, '%'))
</if>
<if test="query.plate != null and query.plate != ''">
AND PLATE LIKE CONCAT('%', CONCAT(#{query.plate}, '%'))
</if>
<if test="query.productIdent != null and query.productIdent != ''">
AND PRODUCT_IDENT LIKE CONCAT('%', CONCAT(#{query.productIdent}, '%'))
</if>
<if test="query.cardNo != null and query.cardNo != ''">
AND CARD_NO LIKE CONCAT('%', CONCAT(#{query.cardNo}, '%'))
</if>
<if test="query.ocIds != null and query.ocIds != ''">
AND OC_ID IN
<foreach collection="query.ocIds.split(',')" item="id"

53
blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java
Unescape View File

@ -1310,8 +1310,9 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
statementVO.setWxLimitName(dictMap.get(statementVO.getWxLimit()));
boolean isRework = !StringUtils.isEmpty(statementVO.getReworkCode()) && !StringUtils.isEmpty(statementVO.getReworkNo());
boolean isFj = statementVO.getYpCode() != null && statementVO.getYpCode().startsWith("FJ");
boolean isDjDy = !StringUtils.isEmpty(statementVO.getWxLimitName()) && (statementVO.getWxLimitName().contains("镀金") || statementVO.getWxLimitName().contains("镀银"));
boolean checkCaType = !StringUtils.isEmpty(statementVO.getWxLimitName()) && (statementVO.getWxLimitName().contains("镀金") || statementVO.getWxLimitName().contains("镀银"));
boolean checkPs = "浸保护剂".equals(statementVO.getPsName()) || "除镀层".equals(statementVO.getPsName()) || "清洗（返工）".equals(statementVO.getPsName());
boolean checkStatementCategory = "镀金".equals(statementVO.getStatementCategory()) || "镀银".equals(statementVO.getStatementCategory()) || "镀金丝".equals(statementVO.getStatementCategory()) || "镀银丝".equals(statementVO.getStatementCategory());
// 如果是返工订单，审理单对应责任部门为3400，不结算
if (isRework && DEPT_CODE_REWORK.equals(statementVO.getResDept())) {
continue;
@ -1339,7 +1340,11 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
}
}
// 如果车间订单为【返工订单】并且工序对应工艺能力类型包含“镀金”、“镀银”，不结算
if (isRework && isDjDy) {
if (isRework && checkCaType) {
continue;
}
// 如果车间订单为【返工订单】并且工序对应结算大类为“镀金”、“镀银”、“镀金丝”、“镀银丝”的不结算
if (isRework && checkStatementCategory) {
continue;
}
statementVO.setRosStatus(OemStatementEntity.NO_SETTLEMENT);
@ -1589,6 +1594,48 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
priceSheet3.setCoating_desc("涂箭头");
priceSheet3.setPrtlotno("JHT");
priceSheetAllList.add(priceSheet3);
PriceSheetVO priceSheet4 = new PriceSheetVO();
priceSheet4.setPrice("60");
priceSheet4.setSplycode("wx000001");
priceSheet4.setSplyname(oemName);
priceSheet4.setPrtum("件");
priceSheet4.setWono("320");
priceSheet4.setSeqid("GXJG-20250228018");
priceSheet4.setGxinfo("热处理铜合金电镀低应力镍");
priceSheet4.setStartdat("2026-01-15");
priceSheet4.setValiddat("2026-12-31");
priceSheet4.setStairflag("1");
priceSheet4.setCoating_desc("涂色标");
priceSheet4.setPrtlotno("JHT");
priceSheetAllList.add(priceSheet4);
PriceSheetVO priceSheet5 = new PriceSheetVO();
priceSheet5.setPrice("60");
priceSheet5.setSplycode("wx000001");
priceSheet5.setSplyname(oemName);
priceSheet5.setPrtum("件");
priceSheet5.setWono("320");
priceSheet5.setSeqid("GXJG-20250228018");
priceSheet5.setGxinfo("热处理铜合金电镀低应力镍");
priceSheet5.setStartdat("2026-01-15");
priceSheet5.setValiddat("2026-12-31");
priceSheet5.setStairflag("1");
priceSheet5.setCoating_desc("涂色带");
priceSheet5.setPrtlotno("JHT");
priceSheetAllList.add(priceSheet5);
PriceSheetVO priceSheet6 = new PriceSheetVO();
priceSheet6.setPrice("60");
priceSheet6.setSplycode("wx000001");
priceSheet6.setSplyname(oemName);
priceSheet6.setPrtum("件");
priceSheet6.setWono("320");
priceSheet6.setSeqid("GXJG-20250228018");
priceSheet6.setGxinfo("热处理铜合金电镀低应力镍");
priceSheet6.setStartdat("2026-01-15");
priceSheet6.setValiddat("2026-12-31");
priceSheet6.setStairflag("1");
priceSheet6.setCoating_desc("涂箭头");
priceSheet6.setPrtlotno("JHT");
priceSheetAllList.add(priceSheet6);
return priceSheetAllList;
}
@ -2041,7 +2088,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
if (vo.getSettleTime() != null) {
vo.setSettleDate(SDF.format(vo.getSettleTime()));
}
if(vo.getRosStatus() != 3){
if (vo.getRosStatus() != 3) {
vo.setMemo("");
}
});

Write Preview
Loading…
Cancel
Save