Merge remote-tracking branch 'origin/main'
This commit is contained in:
		
						commit
						112602e3c9
					
				| 
						 | 
					@ -196,16 +196,15 @@ public class AfterApproveRuleSyncMes implements IRule<PMOAggVO> {
 | 
				
			||||||
    private void syncOrderItemToMes(PMOHeadVO head, PMOItemVO item) throws BusinessException {
 | 
					    private void syncOrderItemToMes(PMOHeadVO head, PMOItemVO item) throws BusinessException {
 | 
				
			||||||
        JSONObject data = new JSONObject();
 | 
					        JSONObject data = new JSONObject();
 | 
				
			||||||
        String vbillcode = head.getVbillcode(); // µ¥¾ÝºÅ
 | 
					        String vbillcode = head.getVbillcode(); // µ¥¾ÝºÅ
 | 
				
			||||||
        String itemRow = item.getVrowno(); // 行号
 | 
					        String itemRow = item.getVrowno(); // 行号        obmlog.info("开始为生产订单 " + vbillcode + " 行 " + itemRow + " 构建同步MES数据。");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        obmlog.info("开始为生产订单 " + vbillcode + " 行 " + itemRow + " 构建同步MES数据。");
 | 
					        // orderNo String 是 生产订单号+行号 vbillcode+itemRow
 | 
				
			||||||
 | 
					        String orderNoWithRow = vbillcode + itemRow;
 | 
				
			||||||
        // orderNo String 是 生产订单号 vbillcode
 | 
					        if (orderNoWithRow.length() > 18) {
 | 
				
			||||||
        if (vbillcode.length() > 18) {
 | 
					            throw new BusinessException("MES同步要求:生产订单 " + vbillcode + " 行 " + itemRow + " 单据号+行号长度不能超过18位,当前长度:" + orderNoWithRow.length());
 | 
				
			||||||
            throw new BusinessException("MES同步要求:生产订单 " + vbillcode + " 行 " + itemRow + " 单据号长度不能超过18位。");
 | 
					 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        data.put("orderNo", vbillcode);
 | 
					        data.put("orderNo", orderNoWithRow);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
 | 
					        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue