@ -8,6 +8,7 @@ import (
"LAPP_GAAS_GFrame_BACKEND/dao/base"
basedal "LAPP_GAAS_GFrame_BACKEND/dao/base"
omdal "LAPP_GAAS_GFrame_BACKEND/dao/om"
bmeta "LAPP_GAAS_GFrame_BACKEND/meta/base"
"LAPP_GAAS_GFrame_BACKEND/utils"
"fmt"
//medal "LAPP_GAAS_GFrame_BACKEND/dao/me"
@ -511,19 +512,19 @@ func (self *PackOrderServiceImplement) OpenPackOrder(context *container.RequestC
/****查询订单信息并且校验*********/
serialDao := omdal . NewSerialOrderDAO ( context . Session ( ) , self . session . User ( ) . Pid , self . session . User ( ) . Userid )
statusDao := omdal . NewSerialOrderStatusDAO ( context . Session ( ) , self . session . User ( ) . Pid , self . session . User ( ) . Userid )
serialOrderInfo , err := serialDao . SelectBySerialOrder ( orderId )
serialOrderInfo , err := serialDao . SelectBySerialOrder ( orderId )
if err != nil {
return nil , err
}
if serialOrderInfo == nil {
return nil , grmi . NewBusinessError ( "工单信息不存在!" )
}
serialOrderStatus , err := statusDao . SelectOne ( orderId )
serialOrderStatus , err := statusDao . SelectOne ( orderId )
if err != nil {
return nil , err
}
if serialOrderStatus == nil || serialOrderStatus . Status != bmodel . WO_STATUS_FINISHED {
return nil , grmi . NewBusinessError ( "工单状态不正确 !" )
return nil , grmi . NewBusinessError ( "工单状态未完成 !" )
}
packTemplateDAO := dal . NewPackTemplateDAO ( context . Session ( ) , self . session . User ( ) . Pid , self . session . User ( ) . Userid )
predicates , err := ConditionOfItemsOfPackOrderTemplate . BuildPredicates ( map [ string ] string { } )
@ -558,19 +559,19 @@ func (self *PackOrderServiceImplement) OpenPackOrderWithTemplate(context *contai
/****查询订单信息并且校验*********/
serialDao := omdal . NewSerialOrderDAO ( context . Session ( ) , self . session . User ( ) . Pid , self . session . User ( ) . Userid )
statusDao := omdal . NewSerialOrderStatusDAO ( context . Session ( ) , self . session . User ( ) . Pid , self . session . User ( ) . Userid )
serialOrderInfo , err := serialDao . SelectBySerialOrder ( orderId )
serialOrderInfo , err := serialDao . SelectBySerialOrder ( orderId )
if err != nil {
return err
}
if serialOrderInfo == nil {
return grmi . NewBusinessError ( "工单信息不存在!" )
}
serialOrderStatus , err := statusDao . SelectOne ( orderId )
serialOrderStatus , err := statusDao . SelectOne ( orderId )
if err != nil {
return err
}
if serialOrderStatus == nil || serialOrderStatus . Status != bmodel . WO_STATUS_FINISHED {
return grmi . NewBusinessError ( "工单状态不正确 !" )
return grmi . NewBusinessError ( "工单状态未完成 !" )
}
packTemplateDAO := dal . NewPackTemplateDAO ( context . Session ( ) , self . session . User ( ) . Pid , self . session . User ( ) . Userid )
packTemplate , err := packTemplateDAO . SelectOne ( packTemplateId )
@ -676,19 +677,19 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *models.Usertab, o
/****查询订单信息并且校验*********/
serialDao := omdal . NewSerialOrderDAO ( session , user . Pid , user . Userid )
statusDao := omdal . NewSerialOrderStatusDAO ( session , user . Pid , user . Userid )
serialOrderInfo , err := serialDao . SelectBySerialOrder ( orderId )
serialOrderInfo , err := serialDao . SelectBySerialOrder ( orderId )
if err != nil {
return nil , err
return nil , err
}
if serialOrderInfo == nil {
return nil , grmi . NewBusinessError ( "工单信息不存在!" )
return nil , grmi . NewBusinessError ( "工单信息不存在!" )
}
serialOrderStatus , err := statusDao . SelectOne ( orderId )
serialOrderStatus , err := statusDao . SelectOne ( orderId )
if err != nil {
return nil , err
return nil , err
}
if serialOrderStatus == nil || serialOrderStatus . Status != bmodel . WO_STATUS_FINISHED {
return nil , grmi . NewBusinessError ( "工单状态不正确 !" )
return nil , grmi . NewBusinessError ( "工单状态未完成 !" )
}
//判断条码是否已经生成过包装
@ -778,7 +779,7 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *models.Usertab, o
packTemplate := packTemplants [ 0 ]
snr := new ( models . Snrtab )
snr . Finr = user . Pid
packOrderId , err := snr . GetNextSnr ( "PackOrder" )
packOrderId , err := snr . GetNextSnr ( packTemplate . PackOrderSn )
if err != nil {
packsession . Rollback ( )
return nil , grmi . NewBusinessError ( "生成包装流水号失败!" )
@ -945,19 +946,19 @@ func (self *PackOrderServiceImplement) SelectTemplates(user *models.Usertab, ord
/****查询订单信息并且校验*********/
serialDao := omdal . NewSerialOrderDAO ( session , user . Pid , user . Userid )
statusDao := omdal . NewSerialOrderStatusDAO ( session , user . Pid , user . Userid )
serialOrderInfo , err := serialDao . SelectBySerialOrder ( orderId )
serialOrderInfo , err := serialDao . SelectBySerialOrder ( orderId )
if err != nil {
return nil , err
return nil , err
}
if serialOrderInfo == nil {
return nil , grmi . NewBusinessError ( "工单信息不存在!" )
return nil , grmi . NewBusinessError ( "工单信息不存在!" )
}
serialOrderStatus , err := statusDao . SelectOne ( orderId )
serialOrderStatus , err := statusDao . SelectOne ( orderId )
if err != nil {
return nil , err
return nil , err
}
if serialOrderStatus == nil || serialOrderStatus . Status != bmodel . WO_STATUS_FINISHED {
return nil , grmi . NewBusinessError ( "工单状态不正确!" )
return nil , grmi . NewBusinessError ( "工单状态不正确!" )
}
temdao := dal . NewPackTemplateDAO ( session , user . Pid , user . Userid )
@ -980,7 +981,7 @@ func (self *PackOrderServiceImplement) SelectTemplates(user *models.Usertab, ord
packTemplate := packTemplants [ 0 ]
snr := new ( models . Snrtab )
snr . Finr = user . Pid
packOrderId , err := snr . GetNextSnr ( "PackOrder" )
packOrderId , err := snr . GetNextSnr ( packTemplate . PackOrderSn )
if err != nil {
packsession . Rollback ( )
return nil , grmi . NewBusinessError ( "生成包装流水号失败!" )
@ -1088,7 +1089,7 @@ func (self *PackOrderServiceImplement) CreatePackOrderByTemplate(user *models.Us
//生成流水号
snr := new ( models . Snrtab )
snr . Finr = user . Pid
packOrderId , err := snr . GetNextSnr ( "PackOrder" )
packOrderId , err := snr . GetNextSnr ( ( packTemplate . PackOrderSn ) )
if err != nil {
return grmi . NewBusinessError ( "生成包装流水号失败!" )
}
@ -1159,16 +1160,16 @@ func (self *PackOrderServiceImplement) CheckPackOrderItem(user *models.Usertab,
/****查询订单信息并且校验*********/
serialDao := omdal . NewSerialOrderDAO ( session , user . Pid , user . Userid )
statusDao := omdal . NewSerialOrderStatusDAO ( session , user . Pid , user . Userid )
serialOrderInfo , err := serialDao . SelectBySerialOrder ( orderId )
serialOrderInfo , err := serialDao . SelectBySerialOrder ( orderId )
if err != nil {
return "" , err
}
if serialOrderInfo == nil {
return "" , grmi . NewBusinessError ( "工单信息不存在!" )
}
serialOrderStatus , err := statusDao . SelectOne ( orderId )
serialOrderStatus , err := statusDao . SelectOne ( orderId )
if err != nil {
return "" , err
return "" , err
}
if serialOrderStatus == nil || serialOrderStatus . Status != bmodel . WO_STATUS_FINISHED {
return "" , grmi . NewBusinessError ( "工单状态不正确!" )
@ -1577,6 +1578,7 @@ func (self *PackOrderServiceImplement) CreatePackOrderPrintInfo(packOrder model.
headDao := basedal . NewLabelHeadDAO ( session , bmodel . PlantNr , "taskPrint" )
detailDao := basedal . NewLabelDetailDAO ( session , bmodel . PlantNr , "taskPrint" )
temPackDao := dal . NewPackTemplateDAO ( session , bmodel . PlantNr , "taskPrint" )
lstdao := basedal . NewLabelTemplateDetailDAO ( session , bmodel . PlantNr , "taskPrint" )
//打印标签
//1)根据打印模板Id查询对应的规则信息
@ -1590,6 +1592,14 @@ func (self *PackOrderServiceImplement) CreatePackOrderPrintInfo(packOrder model.
session . Rollback ( )
return grmi . NewBusinessError ( "打印模板不存在!" )
}
list , err := lstdao . Select ( [ ] grmi . Predicate {
bmeta . LabelTemplateDetail_LabelTemplateId . NewPredicate ( grmi . Equal , printerTem . LabelTemplateId ) ,
} , nil )
if err != nil {
session . Rollback ( )
return grmi . NewBusinessError ( "打印模板配置不存在!" )
}
printerTem . LabelTemplateDetail = list
//2)查询对应的信息集合，构建出map集合
artInfo , err := artDao . SelectOne ( packOrder . MaterialId )
if err != nil || printerTem == nil {
@ -1603,7 +1613,8 @@ func (self *PackOrderServiceImplement) CreatePackOrderPrintInfo(packOrder model.
lableMap [ "$Article-Descr1$" ] = artInfo . Descr1
lableMap [ "$Article-CarModel$" ] = artInfo . CarModel
lableMap [ "$LOG_PackOrder-PackOrderId$" ] = packOrder . PackOrderId
lableMap [ "$LOG_PackOrder-ActQty$" ] = packOrder . ActQty
lableMap [ "$LOG_PackOrder-PackOrderCode$" ] = packOrder . PackOrderId
lableMap [ "$LOG_PackOrder-ActQty$" ] = utils . ValueToInt ( packOrder . ActQty , 0 )
lableMap [ "$LOG_PackOrder-CloseTime$" ] = utils . TimeFormat ( packOrder . CloseTime . Restore ( ) , "yyyy-MM-dd" )
//3)插入模板表里
baseHeadInfo := new ( bmodel . LabelHead )
@ -1633,6 +1644,7 @@ func (self *PackOrderServiceImplement) CreatePackOrderPrintInfo(packOrder model.
for _ , v := range printerTem . LabelTemplateDetail {
if v . ValueParseToggle {
baseDetailInfo := new ( bmodel . LabelDetail )
baseDetailInfo . LabelId = labelId
baseDetailInfo . PlantNr = v . PlantNr
baseDetailInfo . Pos = ( num + 1 )
baseDetailInfo . VariableName = v . LabelItemValue
