Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更改产前准备打印订单总数量、切削时间数据增加、检验任务代办事项数量取值

Browse Source
master
Yangwl 2 years ago
parent 702aa2afe8
commit bd3453a776
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

3
common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
Unescape Escape View File

@ -486,6 +486,9 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
labelPrintDto.setTexture(Texturemap.get("TEXTURE").toString());
}
labelPrintDto.setDrawingVersion(drawingRevision);
/** 订单数量*/
labelPrintDto.setSfcQty(new BigDecimal(sfcDispatchDto.getQtyToBuild()));
/** SFC数量*/
labelPrintDto.setQty(new BigDecimal(sfcServiceById.getQty()));
String workOrder = customFieldsService.getCustomFieldsValue(sfcServiceById.getShopOrderBo(), CustomFieldConstant.SO_WORK_ORDER);
String itemNumber = customFieldsService.getCustomFieldsValue(sfcServiceById.getShopOrderBo(), CustomFieldConstant.SO_ITEM_NUMBER);

19
dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
Unescape Escape View File

@ -960,13 +960,18 @@
</select>
<select id="findSfcDispatchBySfc" resultType="com.foreverwin.mesnac.common.dto.SfcDispatchDto">
SELECT *
FROM Z_SFC_DISPATCH zsd where site=#{site}
<if test="dto.sfc!=null">AND SFC=#{dto.sfc}</if>
<if test="dto.stepId!=null">AND STEP_ID=#{dto.stepId}</if>
<if test="dto.operation!=null">AND OPERATION=#{dto.operation}</if>
<if test="dto.resrce!=null">AND RESRCE=#{dto.resrce}</if>
<if test="dto.handle!=null">AND HANDLE=#{dto.handle}</if>
SELECT
zsd.*,SO.QTY_TO_BUILD
FROM
Z_SFC_DISPATCH zsd
LEFT JOIN SHOP_ORDER SO ON zsd.SHOP_ORDER = SO.SHOP_ORDER
WHERE
zsd.site = '1000'
<if test="dto.sfc!=null">AND zsd.SFC=#{dto.sfc}</if>
<if test="dto.stepId!=null">AND zsd.STEP_ID=#{dto.stepId}</if>
<if test="dto.operation!=null">AND zsd.OPERATION=#{dto.operation}</if>
<if test="dto.resrce!=null">AND zsd.RESRCE=#{dto.resrce}</if>
<if test="dto.handle!=null">AND zsd.HANDLE=#{dto.handle}</if>
</select>

6
equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRunTime.java
Unescape Escape View File

@ -36,7 +36,7 @@ public class ResourceRunTime extends Model<ResourceRunTime> {
@TableField("RUN_TIME")
private Double runTime;
@TableField("UP_TIME")
private LocalDateTime upTime;
private Double upTime;
@TableField("CREATED_USER")
private String createdUser;
@TableField("CREATED_DATA_TIME")
@ -87,11 +87,11 @@ public class ResourceRunTime extends Model<ResourceRunTime> {
this.runTime = runTime;
}
public LocalDateTime getUpTime() {
public Double getUpTime() {
return upTime;
}
public void setUpTime(LocalDateTime upTime) {
public void setUpTime(Double upTime) {
this.upTime = upTime;
}

10
equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRunTimeServiceImpl.java
Unescape Escape View File

@ -81,20 +81,14 @@ public class ResourceRunTimeServiceImpl extends ServiceImpl<ResourceRunTimeMappe
JSONObject jsonObj = (JSONObject) jsonArray.get(i);
String runTime = jsonObj.getString("RUN_TIME");
String upTime = jsonObj.getString("UP_TIME");
String resource = jsonObj.getString("RESOURCE");
resourceRunTime.setRunTime(Double.valueOf(runTime));
resourceRunTime.setUpTime(Double.valueOf(upTime));
resourceRunTime.setResrce(resource);
String upTime = jsonObj.getString("UP_TIME");
if (upTime != null && !upTime.equals("")){
LocalDateTime upDate = LocalDateTime.parse(upTime,dataFormatter);
resourceRunTime.setUpTime(upDate);
}
resourceRunTime.setHandle(UUID.randomUUID().toString());
list.add(resourceRunTime);
}
resourceRunTimeService.saveBatch(list);
}
}

2
quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java
Unescape Escape View File

@ -193,8 +193,6 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ
this.CreateLogisticsTask(request);
}

2
quality/src/main/resources/mapper/InspectionTaskManageMapper.xml
Unescape Escape View File

@ -42,7 +42,7 @@
<select id="findInspectionTask" resultMap="BaseResultMap">
SELECT B.HANDLE, B.SITE, B.CATEGORY, B.TASK_NO, B.DESCRIPTION, B.STATUS, B.INSPECTION_ITEM_BO, B.WORK_CENTER, B.SHOP_ORDER, B.SFC,B.STEP_ID, B.OPERATION, B.STEP_ID, B.RESRCE, B.RESULT,B.QUESTION_C, B.COMMENTS, B.CREATE_USER, B.CREATED_DATE_TIME, B.MODIFY_USER, B.MODIFIED_DATE_TIME,
M.ITEM,M.HANDLE ITEM_BO, Z.DESCRIPTION ITEM_DESCRIPTION,ZNU.FULL_NAME FULL_NAME,RS.DESCRIPTION RESRCE_DESCRIPTION,
O.OPERATION OPERATION,OT.DESCRIPTION OPERATION_DESCRIPTION,S.QTY SFC_QTY,B.COMMENTS COMMENTS,
O.OPERATION OPERATION,OT.DESCRIPTION OPERATION_DESCRIPTION,ZSD.DISPATCH_QTY SFC_QTY,B.COMMENTS COMMENTS,
ZSD.EMPLOYEE_DESCRIPTION DISPATCH_USER,P.SHOP_ORDER,NVL(ZAB.NC_QTY, 0) NC_QTY,B.SFC_DISPATCH_BO,CF.VALUE MAIN_CHECK_USER,
CASE WHEN B.STATUS = 'COMPLETE' THEN TO_CHAR(ZNU2.FULL_NAME) ELSE '' END CHECK_USER,
CASE WHEN B.STATUS = 'COMPLETE' THEN TO_CHAR(B.MODIFIED_DATE_TIME,'yyyy-mm-dd hh24:mi:ss') ELSE '' END CHECK_DATE_TIME

Write Preview
Loading…
Cancel
Save