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

生产管理修改

Browse Source
liweidong
李涛 6 hours ago
parent 388c467192
commit 5399b05621
2 changed files with 12 additions and 12 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. 8
      blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/HandoverRecordServiceImpl.java
  2. 16
      blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataProduceServiceImpl.java

8
blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/HandoverRecordServiceImpl.java
Unescape View File

@ -192,10 +192,10 @@ public class HandoverRecordServiceImpl extends BaseServiceImpl<HandoverRecordMap
hr.setRecDept(workOrder.getUseDept());
hr.setStatus(HandoverRecord.RUN_STATUS_WAIT);
// excflag = erpDataProduceClient.chkSjjd(yo.getYpCode(), yo.getBatchNo()).getData();
// if ("3500".equals(yo.getUseDeptCode()) || "3502".equals(yo.getUseDeptCode()) || "3507".equals(yo.getUseDeptCode()) || "3512".equals(yo.getUseDeptCode())) {
// shjhflag = erpDataProduceClient.chkShjh(woCode, yo.getYpCode(), yo.getPartCode(), yo.getProductIdent(), workOrder.getMakeQty(), woCode).getData();
// }
excflag = erpDataProduceClient.chkSjjd(yo.getYpCode(), yo.getBatchNo()).getData();
if ("3500".equals(yo.getUseDeptCode()) || "3502".equals(yo.getUseDeptCode()) || "3507".equals(yo.getUseDeptCode()) || "3512".equals(yo.getUseDeptCode())) {
shjhflag = erpDataProduceClient.chkShjh(woCode, yo.getYpCode(), yo.getPartCode(), yo.getProductIdent(), workOrder.getMakeQty(), woCode).getData();
}
//zxh 20250721 首件鉴定仅限制入库单
if ("0".equals(excflag) && hr.getHrType().equals(HandoverRecord.HR_TYPE_IN_WAREHOUSE)) {
throw new ServiceException("订单存在首件鉴定未审核，不允许入库");

16
blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataProduceServiceImpl.java
Unescape View File

@ -158,13 +158,13 @@ public class ErpDataProduceServiceImpl implements IErpDataProduceService {
// 显式声明参数
.declareParameters(
new SqlParameter("v_redono", Types.VARCHAR),
new SqlParameter("v_seqno", Types.VARCHAR),
new SqlParameter("v_seqno", Types.INTEGER),
new SqlParameter("v_prtno", Types.VARCHAR),
new SqlParameter("v_splcode", Types.VARCHAR),
new SqlParameter("v_endqty", Types.VARCHAR),
new SqlParameter("v_enddat", Types.VARCHAR),
new SqlParameter("v_endqty", Types.DOUBLE),
new SqlParameter("v_enddat", Types.DATE),
new SqlParameter("v_endman", Types.VARCHAR),
new SqlParameter("v_bfqty", Types.VARCHAR),
new SqlParameter("v_bfqty", Types.INTEGER),
new SqlOutParameter("v_excnote", Types.VARCHAR),
new SqlOutParameter("v_excflag", Types.VARCHAR)
);
@ -197,12 +197,12 @@ public class ErpDataProduceServiceImpl implements IErpDataProduceService {
// 显式声明参数
.declareParameters(
new SqlParameter("v_redono", Types.VARCHAR),
new SqlParameter("v_seqno", Types.VARCHAR),
new SqlParameter("v_seqno", Types.INTEGER),
new SqlParameter("v_prtno", Types.VARCHAR),
new SqlParameter("v_splcode", Types.VARCHAR),
new SqlParameter("v_amount", Types.VARCHAR),
new SqlParameter("v_recqty", Types.VARCHAR),
new SqlParameter("v_recdate", Types.VARCHAR),
new SqlParameter("v_amount", Types.DOUBLE),
new SqlParameter("v_recqty", Types.DOUBLE),
new SqlParameter("v_recdate", Types.DATE),
new SqlParameter("v_recman", Types.VARCHAR),
new SqlParameter("v_reworkgyflag", Types.VARCHAR),
new SqlOutParameter("v_excnote", Types.VARCHAR),

Write Preview
Loading…
Cancel
Save