Compare commits

...

6 Commits

6 changed files with 54 additions and 13 deletions

View File

@@ -3,11 +3,24 @@ import { useSettingStore } from "@/lib/store/useSettings";
export default function DMButtons() { export default function DMButtons() {
const { settings } = useSettingStore(); const { settings } = useSettingStore();
const testServers = ["test1", "test2", "test3"];
const plantToken = settings.filter((n) => n.name === "plantToken"); const plantToken = settings.filter((n) => n.name === "plantToken");
//console.log(plantToken); //console.log(plantToken);
return ( return (
<div className="flex flex-row-reverse gap-1"> <div className="flex flex-row-reverse gap-1">
{/* dev and testserver sees all */}
{testServers.includes(plantToken[0]?.value) && (
<div className="flex flex-row gap-2">
<OrderImport
fileType={"abbott"}
name={"Abbott truck list"}
/>
<OrderImport
fileType={"energizer"}
name={"Energizer Truck List"}
/>
</div>
)}
{plantToken[0]?.value === "usday1" && ( {plantToken[0]?.value === "usday1" && (
<div className="flex flex-row gap-2"> <div className="flex flex-row gap-2">
<OrderImport <OrderImport
@@ -20,6 +33,12 @@ export default function DMButtons() {
/> />
</div> </div>
)} )}
{plantToken[0]?.value === "usflo1" && (
<div className="flex flex-row gap-2"></div>
)}
{plantToken[0]?.value === "usstp1" && (
<div className="flex flex-row gap-2"></div>
)}
</div> </div>
); );
} }

View File

@@ -34,7 +34,12 @@ export default function OcmeCycleCount() {
formState: { errors }, formState: { errors },
reset, reset,
control, control,
} = useForm(); } = useForm({
defaultValues: {
lane: "",
laneType: "name",
},
});
const onSubmit = async (data: any) => { const onSubmit = async (data: any) => {
setData([]); setData([]);
@@ -99,7 +104,6 @@ export default function OcmeCycleCount() {
<Controller <Controller
control={control} control={control}
name="laneType" name="laneType"
defaultValue={""}
render={({ render={({
field: { onChange }, field: { onChange },
fieldState: {}, fieldState: {},

View File

@@ -35,7 +35,7 @@
} }
}, },
"admConfig": { "admConfig": {
"build": 303, "build": 305,
"oldBuild": "backend-0.1.3.zip" "oldBuild": "backend-0.1.3.zip"
}, },
"devDependencies": { "devDependencies": {

View File

@@ -90,6 +90,7 @@ export const abbottOrders = async (data: any, user: any) => {
orders: [], orders: [],
}; };
const oOrders: any = openOrders; const oOrders: any = openOrders;
let correctedOrders: any = orderData let correctedOrders: any = orderData
.filter( .filter(
(o: any) => (o: any) =>
@@ -121,12 +122,29 @@ export const abbottOrders = async (data: any, user: any) => {
}); });
// last map to remove orders that have already been started // last map to remove orders that have already been started
correctedOrders = correctedOrders.filter((oo: any) => // correctedOrders = correctedOrders.filter((oo: any) =>
oOrders.some((o: any) => o.CustomerOrderNumber === oo.po) // oOrders.some((o: any) => o.CustomerOrderNumber === oo.po)
// );
let postedOrders: any = [];
const filterOrders: any = correctedOrders;
filterOrders.forEach((oo: any) => {
const isMatch = openOrders.some(
(o: any) =>
String(o.CustomerOrderNumber).trim() ===
String(oo.CustomerOrderNumber).trim()
); );
if (!isMatch) {
console.log(`ok to update: ${oo.CustomerOrderNumber}`);
postedOrders.push(oo);
} else {
console.log(`Not valid order to update: ${oo.CustomerOrderNumber}`);
//console.log(oo)
}
});
// Map Excel data to predefinedObject format // Map Excel data to predefinedObject format
const orders = correctedOrders.map((o: any) => { const orders = filterOrders.map((o: any) => {
return { return {
customerId: customerID, customerId: customerID,
invoiceAddressId: invoiceID, invoiceAddressId: invoiceID,

View File

@@ -30,7 +30,7 @@ app.openapi(
// "Provided a running number and lot number you can consume material.", // "Provided a running number and lot number you can consume material.",
responses: responses(), responses: responses(),
}), }),
async (c) => { async (c: any) => {
//apiHit(c, { endpoint: "api/sqlProd/close" }); //apiHit(c, { endpoint: "api/sqlProd/close" });
const { data: ppoo, error } = await tryCatch(getPPOO()); const { data: ppoo, error } = await tryCatch(getPPOO());

View File

@@ -20,7 +20,7 @@ app.openapi(
// "Creates a silo adjustment for the silo if and stores the stock numbers.", // "Creates a silo adjustment for the silo if and stores the stock numbers.",
responses: responses(), responses: responses(),
}), }),
async (c) => { async (c: any) => {
//apiHit(c, { endpoint: "api/sqlProd/close" }); //apiHit(c, { endpoint: "api/sqlProd/close" });
try { try {
@@ -29,9 +29,9 @@ app.openapi(
const silo = await getStockSiloData(); const silo = await getStockSiloData();
return c.json( return c.json(
{ {
success: silo.success, success: silo?.success ?? false,
message: silo.message, message: silo?.message ?? "Failed to get silo data",
data: silo.data, data: silo?.data ?? [],
}, },
200 200
); );