Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan

tags/yfai-mes-ext-v2.3
jun 6 months ago
commit 7d0b958f40

@ -93,12 +93,18 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
String vinCode = sortInfo.getVinCode(); String vinCode = sortInfo.getVinCode();
DdlPackBean existPackBean = DdlPackBean.getDdlPackBean(sortInfo.getOrganizeCode()); DdlPackBean existPackBean = DdlPackBean.getDdlPackBean(sortInfo.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(vinCode,"vinCode",existPackBean); DdlPreparedPack.getStringEqualPack(vinCode,"vinCode",existPackBean);
DdlPreparedPack.getStringEqualPack(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.S.getValue(),"orderFlag",existPackBean); // DdlPreparedPack.getStringEqualPack(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.S.getValue(),"orderFlag",existPackBean);
int count = mesWorkOrderRao.findByHqlWhereCount(existPackBean); List<MesWorkOrder> workOrderList = mesWorkOrderRao.findByHqlWhere(existPackBean);
if (count > 0) { if (!workOrderList.isEmpty()) {
sortInfo.setDescription("当前vin号已存在S单!"); MesWorkOrder mesWorkOrder = workOrderList.get(0);
if (mesWorkOrder.getOrderFlag().equals(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.S.getValue())) {
sortInfo.setDescription("当前vin号已存在S单!");
return;
}
sortInfo.setDescription("当前vin号已经解析过!");
return; return;
} }
String organizeCode = partProdGroup.getOrganizeCode(); String organizeCode = partProdGroup.getOrganizeCode();
MesWorkOrder mesWorkOrder = new MesWorkOrder(); MesWorkOrder mesWorkOrder = new MesWorkOrder();
mesWorkOrder.setCustCode(partProdGroup.getCustCode()); mesWorkOrder.setCustCode(partProdGroup.getCustCode());

Loading…
Cancel
Save