Browse Source

工具提示 2023年2月15日 sxm

master
[li_she] 3 years ago
parent
commit
162c2cf9a7
  1. 6
      src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
  2. 9
      src/main/java/com/gaotao/modules/shopOrder/dao/ShopOrderMapper.java
  3. 3
      src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java
  4. 9
      src/main/resources/mapper/shopOrder/ShopOrderMapper.xml

6
src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@ -1478,7 +1478,7 @@ public class ScheduleServiceImpl implements ScheduleService {
String toolCode = String.valueOf(materialMap.get("resultCode")); String toolCode = String.valueOf(materialMap.get("resultCode"));
if (!"200".equalsIgnoreCase(toolCode)) { if (!"200".equalsIgnoreCase(toolCode)) {
String toolMsg = String.valueOf(toolMap.get("resultMsg")); String toolMsg = String.valueOf(toolMap.get("resultMsg"));
String objectId = String.valueOf(materialMap.get("objectId"));
String objectId = String.valueOf(toolMap.get("objectId"));
throw new XJException(toolMsg, Integer.parseInt(toolCode), objectId); throw new XJException(toolMsg, Integer.parseInt(toolCode), objectId);
} }
@ -2025,7 +2025,7 @@ public class ScheduleServiceImpl implements ScheduleService {
String toolCode = String.valueOf(toolMap.get("resultCode")); String toolCode = String.valueOf(toolMap.get("resultCode"));
if (!"200".equalsIgnoreCase(toolCode)) { if (!"200".equalsIgnoreCase(toolCode)) {
String toolMsg = String.valueOf(toolMap.get("resultMsg")); String toolMsg = String.valueOf(toolMap.get("resultMsg"));
String objectId = String.valueOf(materialMap.get("objectId"));
String objectId = String.valueOf(toolMap.get("objectId"));
throw new XJException(toolMsg, Integer.parseInt(toolCode), objectId); throw new XJException(toolMsg, Integer.parseInt(toolCode), objectId);
} }
@ -3583,7 +3583,7 @@ public class ScheduleServiceImpl implements ScheduleService {
String toolCode = String.valueOf(toolMap.get("resultCode")); String toolCode = String.valueOf(toolMap.get("resultCode"));
if (!"200".equalsIgnoreCase(toolCode)) { if (!"200".equalsIgnoreCase(toolCode)) {
String toolMsg = String.valueOf(toolMap.get("resultMsg")); String toolMsg = String.valueOf(toolMap.get("resultMsg"));
String objectId = String.valueOf(materialMap.get("objectId"));
String objectId = String.valueOf(toolMap.get("objectId"));
throw new XJException(toolMsg, Integer.parseInt(toolCode), objectId); throw new XJException(toolMsg, Integer.parseInt(toolCode), objectId);
} }

9
src/main/java/com/gaotao/modules/shopOrder/dao/ShopOrderMapper.java

@ -5,6 +5,7 @@ import com.gaotao.modules.schedule.data.SearchScheduleData;
import com.gaotao.modules.shopOrder.entity.*; import com.gaotao.modules.shopOrder.entity.*;
import com.gaotao.modules.shopOrder.entity.vo.WorkCenterVo; import com.gaotao.modules.shopOrder.entity.vo.WorkCenterVo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -316,5 +317,13 @@ public interface ShopOrderMapper {
List<ShopOrderToolData> getShopOrderToolDatas(SearchScheduleData inData); List<ShopOrderToolData> getShopOrderToolDatas(SearchScheduleData inData);
/**
* @author: sxm
* @description: 获取工单数量
* @param [site, orderNo]
* @return: java.lang.Double
* @date: 2023/2/14 17:36
*/
Double getOrderQtyRequired(@Param("site") String site,@Param("orderNo") String orderNo);
} }

3
src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java

@ -380,6 +380,9 @@ public class ShopOrderServiceImpl implements ShopOrderService {
@Override @Override
public void insertRouteInShopOrder(RouteInShopOrderData routeInShopOrderData) { public void insertRouteInShopOrder(RouteInShopOrderData routeInShopOrderData) {
// 获取工单数量
Double qtyRequired = shopOrderMapper.getOrderQtyRequired(routeInShopOrderData.getSite(),routeInShopOrderData.getOrderNo());
routeInShopOrderData.setQtyRequired(qtyRequired);
shopOrderMapper.insertRouteInShopOrder(routeInShopOrderData); shopOrderMapper.insertRouteInShopOrder(routeInShopOrderData);
} }

9
src/main/resources/mapper/shopOrder/ShopOrderMapper.xml

@ -347,13 +347,13 @@
TimeReported, Efficiency, PlanStartTime, TimeReported, Efficiency, PlanStartTime,
PlanFinishTime, BarcodeID, Remark, PlanFinishTime, BarcodeID, Remark,
PartNo, Crewsize, ClosedFlag, PartNo, Crewsize, ClosedFlag,
ActionNotes)
ActionNotes,QtyScheduled)
values (#{site}, #{orderNo}, #{itemNo}, #{operationDesc}, #{workCenterNo}, #{machSetupTime}, #{machRunFactor}, values (#{site}, #{orderNo}, #{itemNo}, #{operationDesc}, #{workCenterNo}, #{machSetupTime}, #{machRunFactor},
#{factorUnit_DB}, #{factorUnit_DB},
#{factorUnit}, #{qtyRequired}, #{qtyReported}, #{qtyApprove}, #{timeRequired}, #{timeReported}, #{factorUnit}, #{qtyRequired}, #{qtyReported}, #{qtyApprove}, #{timeRequired}, #{timeReported},
#{efficiency}, #{efficiency},
#{planStartTime}, #{planFinishTime}, #{barcodeID}, #{remark}, #{partNo}, #{crewsize}, #{closedFlag}, #{planStartTime}, #{planFinishTime}, #{barcodeID}, #{remark}, #{partNo}, #{crewsize}, #{closedFlag},
#{actionNotes})
#{actionNotes},0)
</insert> </insert>
@ -539,6 +539,11 @@
and T.OrderNo = #{orderNo} and T.OrderNo = #{orderNo}
Order by ItemNo, T.ToolID Order by ItemNo, T.ToolID
</select> </select>
<select id="getOrderQtyRequired" resultType="java.lang.Double">
Select LotSize
from ShopOrder
Where Site = #{site} and OrderNo = #{orderNo}
</select>
</mapper> </mapper>
Loading…
Cancel
Save