发运单导入完成

services/jit/implments/ShipOrder.service.impl.go

@@ -130,6 +130,9 @@ func (impl *ShipOrderServiceImplement) InsertOne(user *models.Usertab, entity *m
 	entity.Status = basmodel.SHIP_ORDER_STATUS_PADDING
 	var shipOrderItemlst []model.ShipOrderItemlst
 	var articleId []string
+	if len(output) <1{
+		return fmt.Errorf("文件格式错误")
+	}
 	for rowIndex, row := range output[0] {
 		if rowIndex == 8 {
 			entity.ShipOrderId = row[11]
@@ -199,11 +202,13 @@ func (impl *ShipOrderServiceImplement) InsertOne(user *models.Usertab, entity *m
 	for _, v := range articleList {
 		articleMap[v.ArtId] = v
 	}
+	allTal := 0
 	for k, v := range shipOrderItemlst {
 		_, ok := articleMap[v.ItemId]
 		if ok {
 			shipOrderItemlst[k].ItemType = "inside"
 			shipOrderItemlst[k].ShipValidateToggle = true
+			allTal += v.PlanQty
 		} else {
 			if v.ItemType == "" {
 				shipOrderItemlst[k].ItemType = "external"
@@ -211,6 +216,7 @@ func (impl *ShipOrderServiceImplement) InsertOne(user *models.Usertab, entity *m
 			shipOrderItemlst[k].ShipValidateToggle = false
 		}
 	}
+	entity.PlanQty = allTal
 	session.Begin()
 
 	//插入明细表
@@ -249,10 +255,30 @@ func (impl *ShipOrderServiceImplement) DeleteOne(user *models.Usertab, shipOrder
 	if record == nil {
 		return grmi.NewBusinessError("不存在指定记录!")
 	}
+	//判断状态是否可以取消
+	if record.Status != basmodel.SHIP_ORDER_STATUS_PADDING{
+		return grmi.NewBusinessError("计划一开始无法删除!")
+	}
+	itemDao := dal.NewShipOrderItemlstDAO(session,user.Pid,user.Userid)
+	session.Begin()
+	urlParameters := make(map[string]string)
+	urlParameters["JIT_ShipOrderItemlst-ShipOrderId"] = record.ShipOrderId
+	condition := DefaultConditionOfShipOrderItemlstAndPaging
+	predicates, err := condition.BuildPredicates(urlParameters)
+	if err != nil {
+		return grmi.NewBusinessError("系统异常!")
+	}
+	err = itemDao.DeleteWhere(predicates)
+	if err != nil {
+		session.Rollback()
+		return err
+	}
 	err = dao.DeleteOne(shipOrderId)
 	if err != nil {
+		session.Rollback()
 		return err
 	}
+	session.Commit()
 	return nil
 }
 

web/controllers/jit/jit.go

@@ -29,7 +29,7 @@ func RegisterRoutes() {
 		// ShipOrder的服务实例
 		var serviceOfShipOrder = svr.NewShipOrderService()
 		// ShipOrder插入一条
-		// RegisterInsertOneShipOrder(shiporder, "/insertone", serviceOfShipOrder.InsertOne)
+		RegisterInsertOneShipOrder(shiporder, "/insertone", serviceOfShipOrder.InsertOne)
 		// ShipOrder插入多条
 		// RegisterInsertShipOrder(shiporder, "/insert", serviceOfShipOrder.Insert)
 		// ShipOrder删除一条